review

License: MIT
Signed-off-by: Dominic Della Valle <ddvpublic@gmail.com>

core/commands/get.go

@@ -253,37 +253,51 @@ func (gw *getWriter) writeExtracted(r io.Reader, fpath string) error {
 	defer bar.Set64(gw.Size)
 
 	extractor := &tar.Extractor{Path: fpath, Progress: bar.Add64}
+	sanitizeExtractor(extractor, gw.Out)
+
+	return extractor.Extract(r)
+}
+
+func sanitizeExtractor(ex *tar.Extractor, logOut io.Writer) {
 	if osh.IsWindows() {
-		extractor.Sanitize(true)
-		builtinSanitizer := extractor.SanitizePathFunc
-		extractor.SanitizePathFunc = func(path string) (string, error) {
-			sanitizedPath, err := builtinSanitizer(path)
-			inBase, outBase := gopath.Base(path), filepath.Base(sanitizedPath)
-			if inBase != outBase {
-				modified = true
-				fmt.Fprintf(gw.Out, "%q extracted as %q\n", inBase, outBase)
-			}
-			return sanitizedPath, err
+		extractor.SanitizePathFunc = winSanitize(extractor, logOut)
+		extractor.LinkFunc = winLink
+	}
+}
+
+// winSanitize wraps the built in sanitizer, adding logging
+func winSanitize(ex *tar.Extractor, logOut io.Writer) func(string) (string, err) {
+	ex.Sanitize(true)
+	if logOut == nil {
+		return ex.SanitizePathFunc
+	}
+	builtinSanitizer := ex.SanitizePathFunc
+	return func(path string) (string, error) {
+		sanitizedPath, err := builtinSanitizer(path)
+		inBase, outBase := gopath.Base(path), filepath.Base(sanitizedPath)
+		if inBase != outBase {
+			modified = true
+			fmt.Fprintf(gw.Out, "%q extracted as %q\n", inBase, outBase)
 		}
-		extractor.LinkFunc = func(l tar.Link) error {
-			if _, err := os.Lstat(l.Name); err == nil {
-				if err = os.Remove(l.Name); err != nil {
-					return err
-				}
-			}
+		return sanitizedPath, err
+	}
 
-			err := os.Symlink(l.Target, l.Name)
-			if err != nil {
-				if haveLinkCreatePriviledge { // non privilege errors
-					return err
-				}
-				return errors.Errorf("Symlink %q->%q cannot be created, user does not have symlink creation privileges (see:https://git.io/vpHKV)", l.Name, l.Target)
-			}
+}
+
+func winLink(l tar.Link) error {
+	if _, err := os.Lstat(l.Name); err == nil {
+		if err = os.Remove(l.Name); err != nil {
+			return err
 		}
 	}
 
-	err := extractor.Extract(r)
-	return err
+	err := os.Symlink(l.Target, l.Name)
+	if err != nil {
+		if haveLinkCreatePriviledge { // non privilege errors
+			return err
+		}
+		return errors.Errorf("Symlink %q->%q cannot be created, user does not have symlink creation privileges (see: https://git.io/vpHKV)", l.Name, l.Target)
+	}
 }
 
 func getCompressOptions(req *cmds.Request) (int, error) {