From b7ef4b8e72b386e8212b24512a6122d80401cb5e Mon Sep 17 00:00:00 2001 From: Boris Bujak Date: Tue, 14 Nov 2023 12:49:30 +0100 Subject: [PATCH] remove build.sh and custom lib --- languages/go/build.sh | 8 --- .../cinterface/bitwarden_library_custom.go | 58 ------------------- 2 files changed, 66 deletions(-) delete mode 100755 languages/go/build.sh delete mode 100644 languages/go/internal/cinterface/bitwarden_library_custom.go diff --git a/languages/go/build.sh b/languages/go/build.sh deleted file mode 100755 index 0735ead6c..000000000 --- a/languages/go/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -n "$BITWARDEN_LIB_PATH" ]; then - sed "s/{{.LibPath}}/$BITWARDEN_LIB_PATH/g" internal/cinterface/bitwarden_library.go > internal/cinterface/bitwarden_library.go - go build -tags custom -else - go build -fi diff --git a/languages/go/internal/cinterface/bitwarden_library_custom.go b/languages/go/internal/cinterface/bitwarden_library_custom.go deleted file mode 100644 index 5acbde67d..000000000 --- a/languages/go/internal/cinterface/bitwarden_library_custom.go +++ /dev/null @@ -1,58 +0,0 @@ -//go:build custom -// +build custom - -package cinterface - -import ( - "fmt" - "unsafe" -) - -/* -#cgo LDFLAGS: -lbitwarden_c -#cgo linux LDFLAGS: -L/usr/local/lib -L/usr/lib -#cgo darwin LDFLAGS: -L/usr/local/lib -L/usr/lib -#include -typedef void* ClientPtr; -extern char* run_command(const char *command, ClientPtr client); -extern ClientPtr init(const char *clientSettings); -extern void free_mem(ClientPtr client); -*/ -import "C" - -type ClientPointer struct { - Pointer C.ClientPtr -} - -type BitwardenLibrary interface { - Init(clientSettings string) (ClientPointer, error) - FreeMem(client ClientPointer) - RunCommand(command string, client ClientPointer) (string, error) -} - -type BitwardenLibraryImpl struct{} - -func NewBitwardenLibrary() BitwardenLibrary { - return &BitwardenLibraryImpl{} -} - -func (b *BitwardenLibraryImpl) Init(clientSettings string) (ClientPointer, error) { - ptr := C.init(C.CString(clientSettings)) - if ptr == nil { - return ClientPointer{}, fmt.Errorf("initialization failed") - } - return ClientPointer{Pointer: ptr}, nil -} - -func (b *BitwardenLibraryImpl) FreeMem(client ClientPointer) { - C.free_mem(client.Pointer) -} - -func (b *BitwardenLibraryImpl) RunCommand(command string, client ClientPointer) (string, error) { - cstr := C.run_command(C.CString(command), client.Pointer) - if cstr == nil { - return "", fmt.Errorf("run command failed") - } - defer C.free(unsafe.Pointer(cstr)) - return C.GoString(cstr), nil -}