Add a mechanism to ignore links during compression

flanglet · Dec 20, 2023 · c4cc87d · c4cc87d
1 parent 4b5744d
commit c4cc87d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 24 deletions.
diff --git a/v2/app/BlockCompressor.go b/v2/app/BlockCompressor.go
@@ -50,7 +50,8 @@ type BlockCompressor struct {
 	checksum      bool
 	skipBlocks    bool
 	fileReorder   bool
-	noDotFile     bool
+	noDotFiles    bool
+	noLinks       bool
 	autoBlockSize bool
 	inputName     string
 	outputName    string
@@ -204,11 +205,18 @@ func NewBlockCompressor(argsMap map[string]any) (*BlockCompressor, error) {
 		this.fileReorder = true
 	}
 
-	if check, prst := argsMap["noDotFile"]; prst == true {
-		this.noDotFile = check.(bool)
-		delete(argsMap, "noDotFile")
+	if check, prst := argsMap["noDotFiles"]; prst == true {
+		this.noDotFiles = check.(bool)
+		delete(argsMap, "noDotFiles")
 	} else {
-		this.noDotFile = false
+		this.noDotFiles = false
+	}
+
+	if check, prst := argsMap["noLinks"]; prst == true {
+		this.noLinks = check.(bool)
+		delete(argsMap, "noLinks")
+	} else {
+		this.noLinks = false
 	}
 
 	this.verbosity = argsMap["verbose"].(uint)
@@ -325,7 +333,7 @@ func (this *BlockCompressor) Compress() (int, uint64) {
 			target = target[0 : len(target)-1]
 		}
 
-		files, err = createFileList(target, files, isRecursive, this.noDotFile)
+		files, err = createFileList(target, files, isRecursive, this.noLinks, this.noDotFiles)
 
 		if err != nil {
 			if ioerr, isIOErr := err.(kio.IOError); isIOErr == true {

diff --git a/v2/app/BlockDecompressor.go b/v2/app/BlockDecompressor.go
@@ -213,7 +213,7 @@ func (this *BlockDecompressor) Decompress() (int, uint64) {
 			target = target[0 : len(target)-1]
 		}
 
-		files, err = createFileList(target, files, isRecursive, false)
+		files, err = createFileList(target, files, isRecursive, false, false)
 
 		if err != nil {
 			if ioerr, isIOErr := err.(kio.IOError); isIOErr == true {

diff --git a/v2/app/Kanzi.go b/v2/app/Kanzi.go
@@ -198,7 +198,8 @@ func processCommandLine(args []string, argsMap map[string]any) int {
 	checksum := false
 	skip := false
 	fileReorder := true
-	noDotFile := false
+	noDotFiles := false
+	noLinks := false
 	from := -1
 	to := -1
 	inputName := ""
@@ -395,7 +396,23 @@ func processCommandLine(args []string, argsMap map[string]any) int {
 				continue
 			}
 
-			noDotFile = true
+			noDotFiles = true
+			continue
+		}
+
+		if arg == "--no-link" {
+			if ctx != -1 {
+				log.Println(fmt.Sprintf(warningNoValOpt, _CMD_LINE_ARGS[ctx]), verbose > 0)
+			}
+
+			ctx = -1
+
+			if mode != "c" {
+				log.Println(fmt.Sprintf(warningCompressOpt, arg), verbose > 0)
+				continue
+			}
+
+			noLinks = true
 			continue
 		}
 
@@ -788,8 +805,12 @@ func processCommandLine(args []string, argsMap map[string]any) int {
 		argsMap["fileReorder"] = false
 	}
 
-	if noDotFile == true {
-		argsMap["noDotFile"] = true
+	if noDotFiles == true {
+		argsMap["noDotFiles"] = true
+	}
+
+	if noLinks == true {
+		argsMap["noLinks"] = true
 	}
 
 	argsMap["jobs"] = uint(tasks)
@@ -983,18 +1004,17 @@ func (this FileCompare) Less(i, j int) bool {
 	return this.data[i].Size > this.data[j].Size
 }
 
-func createFileList(target string, fileList []FileData, isRecursive, ignoreDotFile bool) ([]FileData, error) {
+func createFileList(target string, fileList []FileData, isRecursive, ignoreLinks, ignoreDotFiles bool) ([]FileData, error) {
 	fi, err := os.Stat(target)
 
 	if err != nil {
 		return fileList, err
 	}
 
-	if ignoreDotFile == true {
-		idx := strings.LastIndex(target, pathSeparator)
+	if ignoreDotFiles == true {
 		shortName := target
 
-		if idx > 0 {
+		if idx := strings.LastIndex(shortName, pathSeparator); idx > 0 {
 			shortName = shortName[idx+1:]
 		}
 
@@ -1003,7 +1023,7 @@ func createFileList(target string, fileList []FileData, isRecursive, ignoreDotFi
 		}
 	}
 
-	if fi.Mode().IsRegular() {
+	if fi.Mode().IsRegular() || ((ignoreLinks == false) && (fi.Mode()&fs.ModeSymlink != 0)) {
 		fileList = append(fileList, *NewFileData(target, fi.Size()))
 		return fileList, nil
 	}
@@ -1018,16 +1038,19 @@ func createFileList(target string, fileList []FileData, isRecursive, ignoreDotFi
 				return err
 			}
 
-			if ignoreDotFile == true {
+			if ignoreDotFiles == true {
 				shortName := path
-				idx := strings.Index(shortName, pathSeparator+".")
 
-				if idx > 0 {
+				if idx := strings.LastIndex(shortName, pathSeparator); idx > 0 {
+					shortName = shortName[idx+1:]
+				}
+
+				if len(shortName) > 0 && shortName[0] == '.' {
 					return nil
 				}
 			}
 
-			if fi.Mode().IsRegular() {
+			if fi.Mode().IsRegular() || ((ignoreLinks == false) && (fi.Mode()&fs.ModeSymlink != 0)) {
 				fileList = append(fileList, *NewFileData(path, fi.Size()))
 			}
 
@@ -1046,11 +1069,10 @@ func createFileList(target string, fileList []FileData, isRecursive, ignoreDotFi
 						break
 					}
 
-					if ignoreDotFile == true {
+					if ignoreDotFiles == true {
 						shortName := de.Name()
-						idx := strings.LastIndex(shortName, pathSeparator)
 
-						if idx > 0 {
+						if idx := strings.LastIndex(shortName, pathSeparator); idx > 0 {
 							shortName = shortName[idx+1:]
 						}
 
@@ -1059,7 +1081,9 @@ func createFileList(target string, fileList []FileData, isRecursive, ignoreDotFi
 						}
 					}
 
-					fileList = append(fileList, *NewFileData(target+de.Name(), fi.Size()))
+					if fi.Mode().IsRegular() || ((ignoreLinks == false) && (fi.Mode()&fs.ModeSymlink != 0)) {
+						fileList = append(fileList, *NewFileData(target+de.Name(), fi.Size()))
+					}
 				}
 			}
 		}