From 8c861451b3441b0da255395eadd864f1e6948c50 Mon Sep 17 00:00:00 2001 From: Tyler Smith Date: Tue, 18 Dec 2018 19:31:19 -0800 Subject: [PATCH 1/2] BUGFIX: Handle success message in Windows disk check. --- database/ffldb/disk_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/ffldb/disk_windows.go b/database/ffldb/disk_windows.go index 3206f147c..a2b41c344 100644 --- a/database/ffldb/disk_windows.go +++ b/database/ffldb/disk_windows.go @@ -19,7 +19,7 @@ func getAvailableDiskSpace(path string) (uint64, error) { var freeBytes, totalBytes, availBytes int64 _, _, err := c.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(path))), uintptr(unsafe.Pointer(&freeBytes)), uintptr(unsafe.Pointer(&totalBytes)), uintptr(unsafe.Pointer(&availBytes))) - if err != nil { + if err != nil && err.Error() != "The operation completed successfully." { return 0, err } From 2bb152ff2ec70bc46f15ce90ad166f007041806f Mon Sep 17 00:00:00 2001 From: Tyler Smith Date: Tue, 18 Dec 2018 19:36:23 -0800 Subject: [PATCH 2/2] TWEAK: use Errno != 0 to check for error. --- database/ffldb/disk_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/ffldb/disk_windows.go b/database/ffldb/disk_windows.go index a2b41c344..e31e8ddbc 100644 --- a/database/ffldb/disk_windows.go +++ b/database/ffldb/disk_windows.go @@ -19,7 +19,7 @@ func getAvailableDiskSpace(path string) (uint64, error) { var freeBytes, totalBytes, availBytes int64 _, _, err := c.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(path))), uintptr(unsafe.Pointer(&freeBytes)), uintptr(unsafe.Pointer(&totalBytes)), uintptr(unsafe.Pointer(&availBytes))) - if err != nil && err.Error() != "The operation completed successfully." { + if err != nil && err.(syscall.Errno) != 0 { return 0, err }