Skip to content

Commit 320f25f

Browse files
committed
Revert "refactor(archive): create archived file header from FileInfo"
This reverts commit 2e2b459. If there is no access permission to target item, header creation will failed. Revert to use infomation from parent item's readdir() result.
1 parent da07764 commit 320f25f

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/serverHandler/archiveTar.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ func writeTar(tw *tar.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
2222
size = fInfo.Size()
2323
}
2424

25-
header, err := tar.FileInfoHeader(fInfo, "")
26-
if err != nil {
27-
return err
25+
header := &tar.Header{
26+
Name: archivePath,
27+
Mode: 0664,
28+
Size: size,
29+
ModTime: fInfo.ModTime(),
30+
AccessTime: fInfo.ModTime(),
31+
ChangeTime: fInfo.ModTime(),
2832
}
29-
header.Name = archivePath
3033

31-
err = tw.WriteHeader(header)
34+
err := tw.WriteHeader(header)
3235
if err != nil {
3336
return err
3437
}

src/serverHandler/archiveZip.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@ func writeZip(zw *zip.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
2121
size = fInfo.Size()
2222
}
2323

24-
header, err := zip.FileInfoHeader(fInfo)
25-
if err != nil {
26-
return err
27-
}
28-
header.Name = archivePath
29-
30-
w, err := zw.CreateHeader(header)
24+
w, err := zw.Create(archivePath)
3125
if err != nil {
3226
return err
3327
}

0 commit comments

Comments
 (0)