From bc2c85ada10aa9b6aa9607e9ac9ad0761b95cf1d Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 18 May 2022 20:36:23 -0700 Subject: [PATCH] unix: update openbsd Statfs_t fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes some fields of openbsd Statfs_t from arrays of int8 to arrays of byte. This makes the types of those fields correspond to the types used on most other BSD systems (Darwin, FreeBSD, NetBSD), and simplifies the conversion to Go string. Similar changes: CL 359674, CL 259903, CL 74331. Note that while this patches mkpost.go, the end result is obtained by manual editing of ztypes_openbsd_*.go files. The reasons for this are: 1. automatic regeneration (tried on openbsd 6.9 / amd64) brings in way too many changes (5 files changed, 193 insertions, 45 deletions). 2. I could not figure out how to run openbsd on non-amd64. Nevertheless, this change is sufficient, meaning if someone will actually end up regenerating these (see e.g. CL 347649) after this commit is merged, the fields will still be kept as arrays of byte. Change-Id: I4520889f11f6ac2d9befe17c7a77186198c08cd2 Reviewed-on: https://go-review.googlesource.com/c/sys/+/407195 Run-TryBot: Ian Lance Taylor TryBot-Result: Gopher Robot Auto-Submit: Ian Lance Taylor Reviewed-by: 谢致邦 Reviewed-by: Michael Knyszek Reviewed-by: Ian Lance Taylor Reviewed-by: Tobias Klauser --- unix/mkpost.go | 4 ++-- unix/ztypes_openbsd_386.go | 8 ++++---- unix/ztypes_openbsd_amd64.go | 8 ++++---- unix/ztypes_openbsd_arm.go | 8 ++++---- unix/ztypes_openbsd_arm64.go | 8 ++++---- unix/ztypes_openbsd_mips64.go | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/unix/mkpost.go b/unix/mkpost.go index a2755180..366b2d48 100644 --- a/unix/mkpost.go +++ b/unix/mkpost.go @@ -101,9 +101,9 @@ func main() { convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) - // Convert [n]int8 to [n]byte in Statvfs_t members to simplify + // Convert [n]int8 to [n]byte in Statvfs_t and Statfs_t members to simplify // conversion to string. - convertStatvfsRegex := regexp.MustCompile(`((Fstype|Mnton|Mntfrom)name)(\s+)\[(\d+)\]int8`) + convertStatvfsRegex := regexp.MustCompile(`(([Ff]stype|[Mm]nton|[Mm]ntfrom)name|mntfromspec)(\s+)\[(\d+)\]int8`) b = convertStatvfsRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) // Convert []int8 to []byte in device mapper ioctl interface diff --git a/unix/ztypes_openbsd_386.go b/unix/ztypes_openbsd_386.go index baf5fe65..2ed718ca 100644 --- a/unix/ztypes_openbsd_386.go +++ b/unix/ztypes_openbsd_386.go @@ -94,10 +94,10 @@ type Statfs_t struct { F_namemax uint32 F_owner uint32 F_ctime uint64 - F_fstypename [16]int8 - F_mntonname [90]int8 - F_mntfromname [90]int8 - F_mntfromspec [90]int8 + F_fstypename [16]byte + F_mntonname [90]byte + F_mntfromname [90]byte + F_mntfromspec [90]byte Pad_cgo_0 [2]byte Mount_info [160]byte } diff --git a/unix/ztypes_openbsd_amd64.go b/unix/ztypes_openbsd_amd64.go index e21ae8ec..b4fb97eb 100644 --- a/unix/ztypes_openbsd_amd64.go +++ b/unix/ztypes_openbsd_amd64.go @@ -96,10 +96,10 @@ type Statfs_t struct { F_namemax uint32 F_owner uint32 F_ctime uint64 - F_fstypename [16]int8 - F_mntonname [90]int8 - F_mntfromname [90]int8 - F_mntfromspec [90]int8 + F_fstypename [16]byte + F_mntonname [90]byte + F_mntfromname [90]byte + F_mntfromspec [90]byte _ [2]byte Mount_info [160]byte } diff --git a/unix/ztypes_openbsd_arm.go b/unix/ztypes_openbsd_arm.go index f190651c..2c467504 100644 --- a/unix/ztypes_openbsd_arm.go +++ b/unix/ztypes_openbsd_arm.go @@ -98,10 +98,10 @@ type Statfs_t struct { F_namemax uint32 F_owner uint32 F_ctime uint64 - F_fstypename [16]int8 - F_mntonname [90]int8 - F_mntfromname [90]int8 - F_mntfromspec [90]int8 + F_fstypename [16]byte + F_mntonname [90]byte + F_mntfromname [90]byte + F_mntfromspec [90]byte _ [2]byte Mount_info [160]byte } diff --git a/unix/ztypes_openbsd_arm64.go b/unix/ztypes_openbsd_arm64.go index 84747c58..ddee0451 100644 --- a/unix/ztypes_openbsd_arm64.go +++ b/unix/ztypes_openbsd_arm64.go @@ -94,10 +94,10 @@ type Statfs_t struct { F_namemax uint32 F_owner uint32 F_ctime uint64 - F_fstypename [16]int8 - F_mntonname [90]int8 - F_mntfromname [90]int8 - F_mntfromspec [90]int8 + F_fstypename [16]byte + F_mntonname [90]byte + F_mntfromname [90]byte + F_mntfromspec [90]byte _ [2]byte Mount_info [160]byte } diff --git a/unix/ztypes_openbsd_mips64.go b/unix/ztypes_openbsd_mips64.go index ac5c8b63..eb13d4e8 100644 --- a/unix/ztypes_openbsd_mips64.go +++ b/unix/ztypes_openbsd_mips64.go @@ -94,10 +94,10 @@ type Statfs_t struct { F_namemax uint32 F_owner uint32 F_ctime uint64 - F_fstypename [16]int8 - F_mntonname [90]int8 - F_mntfromname [90]int8 - F_mntfromspec [90]int8 + F_fstypename [16]byte + F_mntonname [90]byte + F_mntfromname [90]byte + F_mntfromspec [90]byte _ [2]byte Mount_info [160]byte }