From bc793178e16bd018a11a724961e974f5392173f5 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Mon, 10 Nov 2025 23:17:40 -0500 Subject: [PATCH] Fix compilation for Windows --- cfg/{umaskUNIX.go => umask_UNIX.go} | 0 cfg/{umaskWIN.go => umask_WIN.go} | 0 ...lipClearProcessDROID.go => clipClearProcess_DROID.go} | 0 ...learProcessGeneric.go => clipClearProcess_GENERIC.go} | 0 clip/{copyDARWIN.go => copy_DARWIN.go} | 0 clip/{copyMOBILE.go => copy_MOBILE.go} | 0 clip/{copyTERMUX.go => copy_TERMUX.go} | 0 clip/{copyUNIX.go => copy_UNIX.go} | 0 clip/{copyWIN.go => copy_WIN.go} | 0 ...LIGeneric.go => launchClipClearProcessCLI_GENERIC.go} | 4 ++-- ...CLIUNIX.go => launchClipClearProcessCLI_LINUX_BSD.go} | 4 ++-- ...UIGeneric.go => launchClipClearProcessGUI_GENERIC.go} | 0 ...GUIUNIX.go => launchClipClearProcessGUI_LINUX_BSD.go} | 0 core/{utilitiesMisc.go => util.go} | 0 crypt/rcw.go | 3 +-- global/{2globalsUNIX.go => 2globals_UNIX.go} | 0 global/{2globalsWIN.go => 2globals_WIN.go} | 0 global/sysProcAttr_UNIX.go | 9 +++++++++ global/sysProcAttr_WIN.go | 9 +++++++++ ...ocationFormatUNIX.go => targetLocationFormat_UNIX.go} | 0 ...tLocationFormatWIN.go => targetLocationFormat_WIN.go} | 0 synccommon/{walkUNIX.go => walk_UNIX.go} | 0 synccommon/{walkWIN.go => walk_WIN.go} | 0 23 files changed, 23 insertions(+), 6 deletions(-) rename cfg/{umaskUNIX.go => umask_UNIX.go} (100%) rename cfg/{umaskWIN.go => umask_WIN.go} (100%) rename clip/{clipClearProcessDROID.go => clipClearProcess_DROID.go} (100%) rename clip/{clipClearProcessGeneric.go => clipClearProcess_GENERIC.go} (100%) rename clip/{copyDARWIN.go => copy_DARWIN.go} (100%) rename clip/{copyMOBILE.go => copy_MOBILE.go} (100%) rename clip/{copyTERMUX.go => copy_TERMUX.go} (100%) rename clip/{copyUNIX.go => copy_UNIX.go} (100%) rename clip/{copyWIN.go => copy_WIN.go} (100%) rename clip/{launchClipClearProcessCLIGeneric.go => launchClipClearProcessCLI_GENERIC.go} (88%) rename clip/{launchClipClearProcessCLIUNIX.go => launchClipClearProcessCLI_LINUX_BSD.go} (89%) rename clip/{launchClipClearProcessGUIGeneric.go => launchClipClearProcessGUI_GENERIC.go} (100%) rename clip/{launchClipClearProcessGUIUNIX.go => launchClipClearProcessGUI_LINUX_BSD.go} (100%) rename core/{utilitiesMisc.go => util.go} (100%) rename global/{2globalsUNIX.go => 2globals_UNIX.go} (100%) rename global/{2globalsWIN.go => 2globals_WIN.go} (100%) create mode 100644 global/sysProcAttr_UNIX.go create mode 100644 global/sysProcAttr_WIN.go rename global/{targetLocationFormatUNIX.go => targetLocationFormat_UNIX.go} (100%) rename global/{targetLocationFormatWIN.go => targetLocationFormat_WIN.go} (100%) rename synccommon/{walkUNIX.go => walk_UNIX.go} (100%) rename synccommon/{walkWIN.go => walk_WIN.go} (100%) diff --git a/cfg/umaskUNIX.go b/cfg/umask_UNIX.go similarity index 100% rename from cfg/umaskUNIX.go rename to cfg/umask_UNIX.go diff --git a/cfg/umaskWIN.go b/cfg/umask_WIN.go similarity index 100% rename from cfg/umaskWIN.go rename to cfg/umask_WIN.go diff --git a/clip/clipClearProcessDROID.go b/clip/clipClearProcess_DROID.go similarity index 100% rename from clip/clipClearProcessDROID.go rename to clip/clipClearProcess_DROID.go diff --git a/clip/clipClearProcessGeneric.go b/clip/clipClearProcess_GENERIC.go similarity index 100% rename from clip/clipClearProcessGeneric.go rename to clip/clipClearProcess_GENERIC.go diff --git a/clip/copyDARWIN.go b/clip/copy_DARWIN.go similarity index 100% rename from clip/copyDARWIN.go rename to clip/copy_DARWIN.go diff --git a/clip/copyMOBILE.go b/clip/copy_MOBILE.go similarity index 100% rename from clip/copyMOBILE.go rename to clip/copy_MOBILE.go diff --git a/clip/copyTERMUX.go b/clip/copy_TERMUX.go similarity index 100% rename from clip/copyTERMUX.go rename to clip/copy_TERMUX.go diff --git a/clip/copyUNIX.go b/clip/copy_UNIX.go similarity index 100% rename from clip/copyUNIX.go rename to clip/copy_UNIX.go diff --git a/clip/copyWIN.go b/clip/copy_WIN.go similarity index 100% rename from clip/copyWIN.go rename to clip/copy_WIN.go diff --git a/clip/launchClipClearProcessCLIGeneric.go b/clip/launchClipClearProcessCLI_GENERIC.go similarity index 88% rename from clip/launchClipClearProcessCLIGeneric.go rename to clip/launchClipClearProcessCLI_GENERIC.go index b39158f..0897093 100644 --- a/clip/launchClipClearProcessCLIGeneric.go +++ b/clip/launchClipClearProcessCLI_GENERIC.go @@ -5,16 +5,16 @@ package clip import ( "os" "os/exec" - "syscall" "github.com/rwinkhart/go-boilerplate/back" + "github.com/rwinkhart/libmutton/global" ) // LaunchClipClearProcess launches the timed clipboard clearing process. // For non-interactive CLI implementations, an entirely separate process is created for this purpose. func LaunchClipClearProcess(copySubject string) { cmd := exec.Command(os.Args[0], "clipclear") - cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true} + cmd.SysProcAttr = global.GetSysProcAttr() _ = back.WriteToStdin(cmd, copySubject) _ = cmd.Start() os.Exit(0) // use os.Exit directly since this version of this function is only meant for non-interactive CLI implementations diff --git a/clip/launchClipClearProcessCLIUNIX.go b/clip/launchClipClearProcessCLI_LINUX_BSD.go similarity index 89% rename from clip/launchClipClearProcessCLIUNIX.go rename to clip/launchClipClearProcessCLI_LINUX_BSD.go index 0157e5f..c910cfe 100644 --- a/clip/launchClipClearProcessCLIUNIX.go +++ b/clip/launchClipClearProcessCLI_LINUX_BSD.go @@ -6,16 +6,16 @@ import ( "os" "os/exec" "strconv" - "syscall" "github.com/rwinkhart/go-boilerplate/back" + "github.com/rwinkhart/libmutton/global" ) // LaunchClipClearProcess launches the timed clipboard clearing process. // For non-interactive CLI implementations, an entirely separate process is created for this purpose. func LaunchClipClearProcess(copySubject string, isWayland bool) { cmd := exec.Command(os.Args[0], "clipclear", strconv.FormatBool(isWayland)) - cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true} + cmd.SysProcAttr = global.GetSysProcAttr() _ = back.WriteToStdin(cmd, copySubject) _ = cmd.Start() os.Exit(0) // use os.Exit directly since this version of this function is only meant for non-interactive CLI implementations diff --git a/clip/launchClipClearProcessGUIGeneric.go b/clip/launchClipClearProcessGUI_GENERIC.go similarity index 100% rename from clip/launchClipClearProcessGUIGeneric.go rename to clip/launchClipClearProcessGUI_GENERIC.go diff --git a/clip/launchClipClearProcessGUIUNIX.go b/clip/launchClipClearProcessGUI_LINUX_BSD.go similarity index 100% rename from clip/launchClipClearProcessGUIUNIX.go rename to clip/launchClipClearProcessGUI_LINUX_BSD.go diff --git a/core/utilitiesMisc.go b/core/util.go similarity index 100% rename from core/utilitiesMisc.go rename to core/util.go diff --git a/crypt/rcw.go b/crypt/rcw.go index 031a7a5..34d3397 100644 --- a/crypt/rcw.go +++ b/crypt/rcw.go @@ -6,7 +6,6 @@ import ( "os" "os/exec" "strings" - "syscall" "github.com/rwinkhart/go-boilerplate/back" "github.com/rwinkhart/libmutton/global" @@ -85,7 +84,7 @@ func launchRCWDProcess() []byte { if Daemonize { cmd := exec.Command(os.Args[0], "startrcwd") - cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true} + cmd.SysProcAttr = global.GetSysProcAttr() _ = back.WriteToStdin(cmd, string(password)) _ = cmd.Start() } diff --git a/global/2globalsUNIX.go b/global/2globals_UNIX.go similarity index 100% rename from global/2globalsUNIX.go rename to global/2globals_UNIX.go diff --git a/global/2globalsWIN.go b/global/2globals_WIN.go similarity index 100% rename from global/2globalsWIN.go rename to global/2globals_WIN.go diff --git a/global/sysProcAttr_UNIX.go b/global/sysProcAttr_UNIX.go new file mode 100644 index 0000000..e4b9657 --- /dev/null +++ b/global/sysProcAttr_UNIX.go @@ -0,0 +1,9 @@ +//go:build !windows + +package global + +import "syscall" + +func GetSysProcAttr() *syscall.SysProcAttr { + return &syscall.SysProcAttr{Setsid: true} +} diff --git a/global/sysProcAttr_WIN.go b/global/sysProcAttr_WIN.go new file mode 100644 index 0000000..15fe0c0 --- /dev/null +++ b/global/sysProcAttr_WIN.go @@ -0,0 +1,9 @@ +//go:build windows + +package global + +import "syscall" + +func GetSysProcAttr() *syscall.SysProcAttr { + return &syscall.SysProcAttr{} +} diff --git a/global/targetLocationFormatUNIX.go b/global/targetLocationFormat_UNIX.go similarity index 100% rename from global/targetLocationFormatUNIX.go rename to global/targetLocationFormat_UNIX.go diff --git a/global/targetLocationFormatWIN.go b/global/targetLocationFormat_WIN.go similarity index 100% rename from global/targetLocationFormatWIN.go rename to global/targetLocationFormat_WIN.go diff --git a/synccommon/walkUNIX.go b/synccommon/walk_UNIX.go similarity index 100% rename from synccommon/walkUNIX.go rename to synccommon/walk_UNIX.go diff --git a/synccommon/walkWIN.go b/synccommon/walk_WIN.go similarity index 100% rename from synccommon/walkWIN.go rename to synccommon/walk_WIN.go