Vincent Batts
ed464af779
This is a gnarly patchset that has been mashed together. It uncovered that some aspects of Check were never really working correctly for `xattr` keywords, but also the `Update()` had been left undone for a while. This includes some API changes around the `Keyword` and `KeyVal` types. Also I would like to update the signature for the `UpdateKeywordFunc` to just accept a `KeyVal` as an argugment, rather than a keyword AND the value. with this context there would be no need to guess on the value of what's passed to the xattr update function of whether it needs or already is base64 encoded. Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
69 lines
2.1 KiB
Go
69 lines
2.1 KiB
Go
// +build darwin freebsd netbsd openbsd
|
|
|
|
package mtree
|
|
|
|
import (
|
|
"archive/tar"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/user"
|
|
"syscall"
|
|
)
|
|
|
|
var (
|
|
flagsKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
// ideally this will pull in from here https://www.freebsd.org/cgi/man.cgi?query=chflags&sektion=2
|
|
return nil, nil
|
|
}
|
|
|
|
unameKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
if hdr, ok := info.Sys().(*tar.Header); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("uname=%s", hdr.Uname))}, nil
|
|
}
|
|
|
|
stat := info.Sys().(*syscall.Stat_t)
|
|
u, err := user.LookupId(fmt.Sprintf("%d", stat.Uid))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []KeyVal{KeyVal(fmt.Sprintf("uname=%s", u.Username))}, nil
|
|
}
|
|
gnameKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
if hdr, ok := info.Sys().(*tar.Header); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("gname=%s", hdr.Gname))}, nil
|
|
}
|
|
|
|
stat := info.Sys().(*syscall.Stat_t)
|
|
g, err := lookupGroupID(fmt.Sprintf("%d", stat.Gid))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []KeyVal{KeyVal(fmt.Sprintf("gname=%s", g.Name))}, nil
|
|
}
|
|
uidKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
if hdr, ok := info.Sys().(*tar.Header); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("uid=%d", hdr.Uid))}, nil
|
|
}
|
|
stat := info.Sys().(*syscall.Stat_t)
|
|
return []KeyVal{KeyVal(fmt.Sprintf("uid=%d", stat.Uid))}, nil
|
|
}
|
|
gidKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
if hdr, ok := info.Sys().(*tar.Header); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("gid=%d", hdr.Gid))}, nil
|
|
}
|
|
if stat, ok := info.Sys().(*syscall.Stat_t); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("gid=%d", stat.Gid))}, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
nlinkKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
if stat, ok := info.Sys().(*syscall.Stat_t); ok {
|
|
return []KeyVal{KeyVal(fmt.Sprintf("nlink=%d", stat.Nlink))}, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
xattrKeywordFunc = func(path string, info os.FileInfo, r io.Reader) ([]KeyVal, error) {
|
|
return nil, nil
|
|
}
|
|
)
|