octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/1081'

Browse Source 
* origin/pr/1081:
  Revisit -no-console option for Windows
This commit is contained in:
Jakob Borg 2014-12-06 12:17:46 +01:00
commit 43d569741b
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/main.go
View File

@ -188,6 +188,7 @@ var (
doUpgrade bool doUpgrade bool
doUpgradeCheck bool doUpgradeCheck bool
noBrowser bool noBrowser bool
noConsole bool
generateDir string generateDir string
logFile string logFile string
noRestart = os.Getenv("STNORESTART") != "" noRestart = os.Getenv("STNORESTART") != ""
@ -214,6 +215,9 @@ func main() {
logFile = filepath.Join(defConfDir, "syncthing.log") logFile = filepath.Join(defConfDir, "syncthing.log")
flag.StringVar(&logFile, "logfile", logFile, "Log file name (blank for stdout)") flag.StringVar(&logFile, "logfile", logFile, "Log file name (blank for stdout)")
// We also add an option to hide the console window
flag.BoolVar(&noConsole, "no-console", false, "Hide console window")
} }
flag.StringVar(&generateDir, "generate", "", "Generate key and config in specified dir, then exit") flag.StringVar(&generateDir, "generate", "", "Generate key and config in specified dir, then exit")
@ -232,6 +236,10 @@ func main() {
flag.Usage = usageFor(flag.CommandLine, usage, fmt.Sprintf(extraUsage, defConfDir)) flag.Usage = usageFor(flag.CommandLine, usage, fmt.Sprintf(extraUsage, defConfDir))
flag.Parse() flag.Parse()
if noConsole {
osutil.HideConsole()
}
if confDir == "" { if confDir == "" {
// Not set as default above because the string can be really long. // Not set as default above because the string can be really long.
confDir = defConfDir confDir = defConfDir

2
internal/osutil/hidden_unix.go
View File

@ -24,3 +24,5 @@ func HideFile(path string) error {
func ShowFile(path string) error { func ShowFile(path string) error {
return nil return nil
} }
func HideConsole() {}

11
internal/osutil/hidden_windows.go
View File

@ -48,3 +48,14 @@ func ShowFile(path string) error {
attrs &^= syscall.FILE_ATTRIBUTE_HIDDEN attrs &^= syscall.FILE_ATTRIBUTE_HIDDEN
return syscall.SetFileAttributes(p, attrs) return syscall.SetFileAttributes(p, attrs)
} }
func HideConsole() {
getConsoleWindow := syscall.NewLazyDLL("kernel32.dll").NewProc("GetConsoleWindow")
showWindow := syscall.NewLazyDLL("user32.dll").NewProc("ShowWindow")
if getConsoleWindow.Find() == nil && showWindow.Find() == nil {
hwnd, _, _ := getConsoleWindow.Call()
if hwnd != 0 {
showWindow.Call(hwnd, 0)
}
}
}