GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-01 22:57:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

unix: convert Utsname members from {u,}int8 array to byte array

Browse Source 
In order to make conversion to string easier, change the Utsname
members from int8 array to byte array.

Also add a test on Linux for Uname and the string conversion of the
Utsname members.

Fixes golang/go#20753

Change-Id: Iec793dfb4a6dd8f3523cf0b6284a6162074f2e9e
Reviewed-on: https://go-review.googlesource.com/74331
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Tobias Klauser
2017-10-31 08:17:53 +00:00
committed by Tobias Klauser
parent 661970f62f
commit 4da7545edf
15 changed files with 93 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unix/mkpost.go
+5
View File
@@ -56,6 +56,11 @@ func main() {
removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`)
b = removeFieldsRegex.ReplaceAll(b, []byte("_")) b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
// Convert [65]int8 to [65]byte in Utsname members to simplify
// conversion to string; see golang.org/issue/20753
convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`)
b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte"))
// We refuse to export private fields on s390x // We refuse to export private fields on s390x
if goarch == "s390x" && goos == "linux" { if goarch == "s390x" && goos == "linux" {
// Remove cgo padding fields // Remove cgo padding fields
unix/syscall_linux_test.go
+11
View File
@@ -231,6 +231,17 @@ func TestSelect(t *testing.T) {
} }
} }
func TestUname(t *testing.T) {
var utsname unix.Utsname
err := unix.Uname(&utsname)
if err != nil {
t.Fatalf("Uname: %v", err)
}
// conversion from []byte to string, golang.org/issue/20753
t.Logf("OS: %s/%s %s", string(utsname.Sysname[:]), string(utsname.Machine[:]), string(utsname.Release[:]))
}
// utilities taken from os/os_test.go // utilities taken from os/os_test.go
func touch(t *testing.T, name string) { func touch(t *testing.T, name string) {
unix/ztypes_linux_386.go
+6 -6
View File
@@ -621,12 +621,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_amd64.go
+6 -6
View File
@@ -637,12 +637,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_arm.go
+6 -6
View File
@@ -609,12 +609,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]uint8 Sysname [65]byte
Nodename [65]uint8 Nodename [65]byte
Release [65]uint8 Release [65]byte
Version [65]uint8 Version [65]byte
Machine [65]uint8 Machine [65]byte
Domainname [65]uint8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_arm64.go
+6 -6
View File
@@ -615,12 +615,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_mips.go
+6 -6
View File
@@ -614,12 +614,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_mips64.go
+6 -6
View File
@@ -618,12 +618,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_mips64le.go
+6 -6
View File
@@ -618,12 +618,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_mipsle.go
+6 -6
View File
@@ -614,12 +614,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_ppc64.go
+6 -6
View File
@@ -625,12 +625,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]uint8 Sysname [65]byte
Nodename [65]uint8 Nodename [65]byte
Release [65]uint8 Release [65]byte
Version [65]uint8 Version [65]byte
Machine [65]uint8 Machine [65]byte
Domainname [65]uint8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_ppc64le.go
+6 -6
View File
@@ -625,12 +625,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]uint8 Sysname [65]byte
Nodename [65]uint8 Nodename [65]byte
Release [65]uint8 Release [65]byte
Version [65]uint8 Version [65]byte
Machine [65]uint8 Machine [65]byte
Domainname [65]uint8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_s390x.go
+6 -6
View File
@@ -642,12 +642,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_linux_sparc64.go
+6 -6
View File
@@ -601,12 +601,12 @@ type Sysinfo_t struct {
} }
type Utsname struct { type Utsname struct {
Sysname [65]int8 Sysname [65]byte
Nodename [65]int8 Nodename [65]byte
Release [65]int8 Release [65]byte
Version [65]int8 Version [65]byte
Machine [65]int8 Machine [65]byte
Domainname [65]int8 Domainname [65]byte
} }
type Ustat_t struct { type Ustat_t struct {
unix/ztypes_solaris_amd64.go
+5 -5
View File
@@ -263,11 +263,11 @@ type FdSet struct {
} }
type Utsname struct { type Utsname struct {
Sysname [257]int8 Sysname [257]byte
Nodename [257]int8 Nodename [257]byte
Release [257]int8 Release [257]byte
Version [257]int8 Version [257]byte
Machine [257]int8 Machine [257]byte
} }
type Ustat_t struct { type Ustat_t struct {