Skip to content

Commit a88ec15

Browse files
authored
Merge pull request #108 from tklauser/xattr-sys-unix
sysx: use xattr functions from x/sys/unix
2 parents 3e8f2ea + 6268e28 commit a88ec15

8 files changed

Lines changed: 9 additions & 803 deletions

sysx/xattr_linux.go

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,44 @@
11
package sysx
22

3-
import "syscall"
4-
5-
// These functions will be generated by generate.sh
6-
// $ GOOS=linux GOARCH=386 ./generate.sh xattr
7-
// $ GOOS=linux GOARCH=amd64 ./generate.sh xattr
8-
// $ GOOS=linux GOARCH=arm ./generate.sh xattr
9-
// $ GOOS=linux GOARCH=arm64 ./generate.sh xattr
10-
// $ GOOS=linux GOARCH=ppc64 ./generate.sh xattr
11-
// $ GOOS=linux GOARCH=ppc64le ./generate.sh xattr
12-
// $ GOOS=linux GOARCH=s390x ./generate.sh xattr
3+
import "golang.org/x/sys/unix"
134

145
// Listxattr calls syscall listxattr and reads all content
156
// and returns a string array
167
func Listxattr(path string) ([]string, error) {
17-
return listxattrAll(path, syscall.Listxattr)
8+
return listxattrAll(path, unix.Listxattr)
189
}
1910

2011
// Removexattr calls syscall removexattr
2112
func Removexattr(path string, attr string) (err error) {
22-
return syscall.Removexattr(path, attr)
13+
return unix.Removexattr(path, attr)
2314
}
2415

2516
// Setxattr calls syscall setxattr
2617
func Setxattr(path string, attr string, data []byte, flags int) (err error) {
27-
return syscall.Setxattr(path, attr, data, flags)
18+
return unix.Setxattr(path, attr, data, flags)
2819
}
2920

3021
// Getxattr calls syscall getxattr
3122
func Getxattr(path, attr string) ([]byte, error) {
32-
return getxattrAll(path, attr, syscall.Getxattr)
23+
return getxattrAll(path, attr, unix.Getxattr)
3324
}
3425

35-
//sys llistxattr(path string, dest []byte) (sz int, err error)
36-
3726
// LListxattr lists xattrs, not following symlinks
3827
func LListxattr(path string) ([]string, error) {
39-
return listxattrAll(path, llistxattr)
28+
return listxattrAll(path, unix.Llistxattr)
4029
}
4130

42-
//sys lremovexattr(path string, attr string) (err error)
43-
4431
// LRemovexattr removes an xattr, not following symlinks
4532
func LRemovexattr(path string, attr string) (err error) {
46-
return lremovexattr(path, attr)
33+
return unix.Lremovexattr(path, attr)
4734
}
4835

49-
//sys lsetxattr(path string, attr string, data []byte, flags int) (err error)
50-
5136
// LSetxattr sets an xattr, not following symlinks
5237
func LSetxattr(path string, attr string, data []byte, flags int) (err error) {
53-
return lsetxattr(path, attr, data, flags)
38+
return unix.Lsetxattr(path, attr, data, flags)
5439
}
5540

56-
//sys lgetxattr(path string, attr string, dest []byte) (sz int, err error)
57-
5841
// LGetxattr gets an xattr, not following symlinks
5942
func LGetxattr(path, attr string) ([]byte, error) {
60-
return getxattrAll(path, attr, lgetxattr)
43+
return getxattrAll(path, attr, unix.Lgetxattr)
6144
}

sysx/xattr_linux_386.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

sysx/xattr_linux_amd64.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)