smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

archive: rename addFile's "file" param to "source" (MR 22)

Browse Source 
"file" is too ambiguous
This commit is contained in:
Clayton Craft
2022-09-09 12:15:52 -07:00
parent 4f601087e1
commit 961c455d59
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/archive/archive.go
View File

@@ -78,28 +78,28 @@ func (archive *Archive) AddItem(source string, dest string) error {
return archive.addFile(source, dest) return archive.addFile(source, dest)
} }
func (archive *Archive) addFile(file string, dest string) error { func (archive *Archive) addFile(source string, dest string) error {
if err := archive.addDir(filepath.Dir(dest)); err != nil { if err := archive.addDir(filepath.Dir(dest)); err != nil {
return err return err
} }
if archive.Files[file] { if archive.Files[source] {
// Already written to cpio // Already written to cpio
return nil return nil
} }
fileStat, err := os.Lstat(file) sourceStat, err := os.Lstat(source)
if err != nil { if err != nil {
log.Print("AddFile: failed to stat file: ", file) log.Print("addFile: failed to stat file: ", source)
return err return err
} }
// Symlink: write symlink to archive then set 'file' to link target // Symlink: write symlink to archive then set 'file' to link target
if fileStat.Mode()&os.ModeSymlink != 0 { if sourceStat.Mode()&os.ModeSymlink != 0 {
// log.Printf("File %q is a symlink", file) // log.Printf("File %q is a symlink", file)
target, err := os.Readlink(file) target, err := os.Readlink(source)
if err != nil { if err != nil {
log.Print("AddFile: failed to get symlink target: ", file) log.Print("addFile: failed to get symlink target: ", source)
return err return err
} }
@@ -118,13 +118,13 @@ func (archive *Archive) addFile(file string, dest string) error {
return err return err
} }
archive.Files[file] = true archive.Files[source] = true
if filepath.Dir(target) == "." { if filepath.Dir(target) == "." {
target = filepath.Join(filepath.Dir(file), target) target = filepath.Join(filepath.Dir(source), target)
} }
// make sure target is an absolute path // make sure target is an absolute path
if !filepath.IsAbs(target) { if !filepath.IsAbs(target) {
target, err = misc.RelativeSymlinkTargetToDir(target, filepath.Dir(file)) target, err = misc.RelativeSymlinkTargetToDir(target, filepath.Dir(source))
if err != nil { if err != nil {
return err return err
} }
@@ -138,7 +138,7 @@ func (archive *Archive) addFile(file string, dest string) error {
// log.Printf("writing file: %q", file) // log.Printf("writing file: %q", file)
fd, err := os.Open(file) fd, err := os.Open(source)
if err != nil { if err != nil {
return err return err
} }
@@ -147,8 +147,8 @@ func (archive *Archive) addFile(file string, dest string) error {
destFilename := strings.TrimPrefix(dest, "/") destFilename := strings.TrimPrefix(dest, "/")
hdr := &cpio.Header{ hdr := &cpio.Header{
Name: destFilename, Name: destFilename,
Mode: cpio.FileMode(fileStat.Mode().Perm()), Mode: cpio.FileMode(sourceStat.Mode().Perm()),
Size: fileStat.Size(), Size: sourceStat.Size(),
// Checksum: 1, // Checksum: 1,
} }
if err := archive.cpioWriter.WriteHeader(hdr); err != nil { if err := archive.cpioWriter.WriteHeader(hdr); err != nil {
@@ -159,7 +159,7 @@ func (archive *Archive) addFile(file string, dest string) error {
return err return err
} }
archive.Files[file] = true archive.Files[source] = true
return nil return nil
} }