diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-25 02:23:34 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-25 02:23:34 +0200 |
| commit | b33299a29713f2d87fba572010f87f1361480cba (patch) | |
| tree | 432899e15da424b1a2c28041190db3144c94480c /ringlogger | |
| parent | build: opt in to walk cgo (diff) | |
| download | wireguard-windows-b33299a29713f2d87fba572010f87f1361480cba.tar.xz wireguard-windows-b33299a29713f2d87fba572010f87f1361480cba.zip | |
global: use filepath.Join uniformly
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ringlogger')
| -rw-r--r-- | ringlogger/dump_windows.go | 10 | ||||
| -rw-r--r-- | ringlogger/global.go | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ringlogger/dump_windows.go b/ringlogger/dump_windows.go index 7faf8ffc..552410e5 100644 --- a/ringlogger/dump_windows.go +++ b/ringlogger/dump_windows.go @@ -8,7 +8,7 @@ package ringlogger import ( "io" "os" - "path" + "path/filepath" "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" @@ -16,13 +16,13 @@ import ( ) func DumpTo(out io.Writer, localSystem bool) error { - var filepath string + var path string if !localSystem { root, err := conf.RootDirectory() if err != nil { return err } - filepath = path.Join(root, "log.bin") + path = filepath.Join(root, "log.bin") } else { k, err := registry.OpenKey(registry.LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\S-1-5-18", registry.QUERY_VALUE) if err != nil { @@ -38,9 +38,9 @@ func DumpTo(out io.Writer, localSystem bool) error { if err != nil { return err } - filepath = path.Join(systemprofile, "AppData", "Local", "WireGuard", "log.bin") + path = filepath.Join(systemprofile, "AppData", "Local", "WireGuard", "log.bin") } - file, err := os.Open(filepath) + file, err := os.Open(path) if err != nil { return err } diff --git a/ringlogger/global.go b/ringlogger/global.go index 8d8f8ec8..60e750a5 100644 --- a/ringlogger/global.go +++ b/ringlogger/global.go @@ -7,7 +7,7 @@ package ringlogger import ( "log" - "path" + "path/filepath" "golang.zx2c4.com/wireguard/windows/conf" ) @@ -22,7 +22,7 @@ func InitGlobalLogger(tag string) error { if err != nil { return err } - Global, err = NewRinglogger(path.Join(root, "log.bin"), tag) + Global, err = NewRinglogger(filepath.Join(root, "log.bin"), tag) if err != nil { return err } |