Skip to content

Add NewDiskUsageOrError returning any error #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zalenskivolt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add NewDiskUsageOrError returning any error #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c96af6
Use x/sys-package instead of syscall, being deprecated
avekob May 16, 2023
9e49012
Add NewDiskUsageOrError returning any error
zalenskivolt Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions du/diskusage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
//go:build !windows
// +build !windows

package du

import "syscall"
import (
"golang.org/x/sys/unix"
)

// DiskUsage contains usage data and provides user-friendly access methods
type DiskUsage struct {
stat *syscall.Statfs_t
stat *unix.Statfs_t
}

// NewDiskUsages returns an object holding the disk usage of volumePath
// or nil in case of error (invalid path, etc)
func NewDiskUsage(volumePath string) *DiskUsage {
du, _ := NewDiskUsageOrError(volumePath)
return du
}

var stat syscall.Statfs_t
syscall.Statfs(volumePath, &stat)
return &DiskUsage{&stat}
// NewDiskUsagesOrError returns an object holding the disk usage of volumePath
// or any error (invalid path, etc)
func NewDiskUsageOrError(volumePath string) (*DiskUsage, error) {
stat := unix.Statfs_t{}
err := unix.Statfs(volumePath, &stat)
if err != nil {
return nil, err
}
return &DiskUsage{&stat}, nil
}

// Free returns total free bytes on file system
Expand Down
22 changes: 17 additions & 5 deletions du/diskusage_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package du

import (
"syscall"
"unsafe"

"golang.org/x/sys/windows"
)

type DiskUsage struct {
Expand All @@ -14,19 +15,30 @@ type DiskUsage struct {
// NewDiskUsages returns an object holding the disk usage of volumePath
// or nil in case of error (invalid path, etc)
func NewDiskUsage(volumePath string) *DiskUsage {
du, _ := NewDiskUsageOrError(volumePath)
return du
}

h := syscall.MustLoadDLL("kernel32.dll")
// NewDiskUsagesOrError returns an object holding the disk usage of volumePath
// or any error (invalid path, etc)
func NewDiskUsageOrError(volumePath string) (*DiskUsage, error) {
h := windows.MustLoadDLL("kernel32.dll")
c := h.MustFindProc("GetDiskFreeSpaceExW")

du := &DiskUsage{}

c.Call(
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(volumePath))),
r1, _, err := c.Call(
uintptr(unsafe.Pointer(windows.StringToUTF16Ptr(volumePath))),
uintptr(unsafe.Pointer(&du.freeBytes)),
uintptr(unsafe.Pointer(&du.totalBytes)),
uintptr(unsafe.Pointer(&du.availBytes)))

return du
// If the function fails, the return value is zero (0)
if r1 == 0 {
return nil, err
}

return du, nil
}

// Free returns total free bytes on file system
Expand Down