Skip to content

Include symlinks in manpage dump #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
classabbyamp wants to merge 2 commits into from
Closed

Include symlinks in manpage dump #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbb509
cmd/xmandump/main.go: add handling for reading links from files.plist
classabbyamp Apr 4, 2022
f8f48c7
cmd/xmandump/main.go: include symlinks in dump
classabbyamp Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions cmd/xmandump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func (d *Dumper) processPackage(ctx context.Context, pkg *xrepo.Package, file st

scanPackage:
manpages = map[string]struct{}{}
for _, file := range files.Files {
for _, file := range append(files.Files, files.Links...) {
if strings.HasPrefix(file.File, manDirsPrefix) {
pkgfile := "." + file.File
manpages[pkgfile] = struct{}{}
Expand Down Expand Up @@ -414,16 +414,17 @@ done:
}

// processPackageFile checks the tar header to see if the packaged file is a manpage and, if it is,
// extracts it. If the packaged file is a manpage symlink or link, it is ignored.
// extracts it. If the packaged file is a manpage symlink, create that link.
func (d *Dumper) processPackageFile(ctx context.Context, pkg *xrepo.Package, hdr *tar.Header, r io.Reader) (err error) {
ctx = WithFields(ctx, logPkgFile(hdr.Name))
symlink := false

switch hdr.Typeflag {
case tar.TypeReg:
case tar.TypeLink, tar.TypeSymlink:
// TODO: Handle manpage symlinks at all?
// return processManLink(ctx, hdr)
return nil
Debug(ctx, "Found manpage")
case tar.TypeSymlink:
Debug(ctx, "Found symlink")
symlink = true
default:
return nil
}
Expand All @@ -433,8 +434,6 @@ func (d *Dumper) processPackageFile(ctx context.Context, pkg *xrepo.Package, hdr
return nil
}

Debug(ctx, "Found manpage")

relpath := strings.TrimPrefix(pkgfile, manPathTrimPrefix)
relpath = filepath.FromSlash(relpath)
reldir := filepath.Dir(relpath)
Expand All @@ -446,17 +445,24 @@ func (d *Dumper) processPackageFile(ctx context.Context, pkg *xrepo.Package, hdr
return err
}

// TODO: Dump manpage to filesystem after stripping usr/share/ prefix
f, err := os.Create(relpath)
if err != nil {
Error(ctx, "Unable to create dumped file")
return err
}
defer logClose(ctx, f)
if !symlink {
// TODO: Dump manpage to filesystem after stripping usr/share/ prefix
f, err := os.Create(relpath)
if err != nil {
Error(ctx, "Unable to create dumped file")
return err
}
defer logClose(ctx, f)

if _, err := io.Copy(f, r); err != nil {
Error(ctx, "Error copying pkgfile to dumpfile", zap.Error(err))
return err
if _, err := io.Copy(f, r); err != nil {
Error(ctx, "Error copying pkgfile to dumpfile", zap.Error(err))
return err
}
} else {
if err := os.Symlink(hdr.Linkname, relpath); err != nil {
Error(ctx, "Unable to create symlink")
return err
}
}

d.recordChange(pkg.FilenameSHA256, relpath)
Expand All @@ -474,6 +480,7 @@ func logClose(ctx context.Context, c io.Closer) (err error) {
type packageFiles struct {
Files []packageFile `plist:"files"`
Dirs []packageFile `plist:"dirs"`
Links []packageFile `plist:"links"`
}

func (p *packageFiles) Empty() bool {
Expand Down