optimize

Author: yincongcyincong

src/archive/tar/reader.go

@@ -380,9 +380,6 @@ func (tr *Reader) readHeader() (*Header, *block, error) {
 	v7 := tr.blk.toV7()
 	hdr.Typeflag = v7.typeFlag()[0]
 	hdr.Name = p.parseString(v7.name())
-	if hdr.FileInfo().IsDir() && !strings.HasSuffix(hdr.Name, "/") {
-		hdr.Name += "/"
-	}
 	hdr.Linkname = p.parseString(v7.linkName())
 	hdr.Size = p.parseNumeric(v7.size())
 	hdr.Mode = p.parseNumeric(v7.mode())

src/archive/tar/writer.go

@@ -423,7 +423,7 @@ func (tw *Writer) AddFS(fsys fs.FS) error {
 		if err != nil {
 			return err
 		}
-		h.Name = name
+		h.Name = strings.TrimSuffix(name, info.Name()) + h.Name
 		if err := tw.WriteHeader(h); err != nil {
 			return err
 		}

src/archive/zip/reader.go

@@ -384,10 +384,6 @@ func readDirectoryHeader(f *File, r io.Reader) error {
 		return err
 	}
 	f.Name = string(d[:filenameLen])
-	if f.FileInfo().IsDir() && !strings.HasSuffix(f.Name, "/") {
-		f.Name += "/"
-	}
-
 	f.Extra = d[filenameLen : filenameLen+extraLen]
 	f.Comment = string(d[filenameLen+extraLen:])
 

src/archive/zip/struct.go

@@ -201,6 +201,7 @@ func (fi headerFileInfo) String() string {
 // of the returned header to provide the full path name of the file.
 // If compression is desired, callers should set the FileHeader.Method
 // field; it is unset by default.
+// If fi describes a directory, a slash is appended to the name.
 func FileInfoHeader(fi fs.FileInfo) (*FileHeader, error) {
 	size := fi.Size()
 	fh := &FileHeader{
@@ -214,6 +215,9 @@ func FileInfoHeader(fi fs.FileInfo) (*FileHeader, error) {
 	} else {
 		fh.UncompressedSize = uint32(fh.UncompressedSize64)
 	}
+	if fi.IsDir() {
+		fh.Name = fh.Name + "/"
+	}
 	return fh, nil
 }
 

src/archive/zip/writer.go

@@ -519,7 +519,7 @@ func (w *Writer) AddFS(fsys fs.FS) error {
 		if err != nil {
 			return err
 		}
-		h.Name = name
+		h.Name = strings.TrimSuffix(name, info.Name()) + h.Name
 		h.Method = Deflate
 		fw, err := w.CreateHeader(h)
 		if err != nil {