host: use unix.ByteSliceToString

Use ByteSliceToString provided in golang.org/x/sys/unix to convert
\0-terminated byte slices to strings.
pull/1393/head
Tobias Klauser 2 years ago
parent 3b918ebd29
commit f9a5834e0e
No known key found for this signature in database
GPG Key ID: 6F5040074CCC0D04

@ -319,7 +319,7 @@ func KernelVersionWithContext(ctx context.Context) (version string, err error) {
if err != nil { if err != nil {
return "", err return "", err
} }
return string(utsname.Release[:bytes.IndexByte(utsname.Release[:], 0)]), nil return unix.ByteSliceToString(utsname.Release[:]), nil
} }
func getSlackwareVersion(contents []string) string { func getSlackwareVersion(contents []string) string {

@ -3,14 +3,13 @@
package host package host
import ( import "golang.org/x/sys/unix"
"bytes"
"golang.org/x/sys/unix"
)
func KernelArch() (string, error) { func KernelArch() (string, error) {
var utsname unix.Utsname var utsname unix.Utsname
err := unix.Uname(&utsname) err := unix.Uname(&utsname)
return string(utsname.Machine[:bytes.IndexByte(utsname.Machine[:], 0)]), err if err != nil {
return "", err
}
return unix.ByteSliceToString(utsname.Machine[:]), nil
} }

Loading…
Cancel
Save