Use filepath.Clean to remove trailing slashes

darstahl · darstahl · commit edec71c0cc53 · 2018-05-04T17:12:43.000-07:00
Signed-off-by: Darren Stahl &lt;darst@microsoft.com&gt;
diff --git a/mount/mount_windows.go b/mount/mount_windows.go
@@ -98,11 +98,12 @@ func (m *Mount) Mount(target string) (retErr error) {
 		}
 	}
 
-	for strings.HasSuffix(target, string(os.PathSeparator)) {
-		target = target[:len(target)-1]
-	}
-
-	idf, err := os.Create(target + ":layerid")
+	// Remove any trailing slashes in preparation to add an Alternate Data Stream for the layerid,
+	// see https://blogs.technet.microsoft.com/askcore/2013/03/24/alternate-data-streams-in-ntfs/
+	// for details on Alternate Data Streams.
+	target = filepath.Clean(target)
+	dir, file := filepath.Split(target)
+	idf, err := os.Create(filepath.Join(dir, file+":layerid"))
 	if err != nil {
 		return err
 	}
@@ -140,7 +141,10 @@ func Unmount(mount string, flags int) error {
 		return errors.Wrapf(err, "unable to find mounted volume %s", mount)
 	}
 
-	layerPathb, err := ioutil.ReadFile(mount + ":layerid")
+	// Remove any trailing slashes
+	mount = filepath.Clean(mount)
+	dir, file := filepath.Split(mount)
+	layerPathb, err := ioutil.ReadFile(filepath.Join(dir, file+":layerid"))
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,12 @@ func (m *Mount) Mount(target string) (retErr error) {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- for strings.HasSuffix(target, string(os.PathSeparator)) {`
`102`		`- target = target[:len(target)-1]`
`103`		`- }`
`104`		`-`
`105`		`- idf, err := os.Create(target + ":layerid")`
	`101`	`+ // Remove any trailing slashes in preparation to add an Alternate Data Stream for the layerid,`
	`102`	`+ // see https://blogs.technet.microsoft.com/askcore/2013/03/24/alternate-data-streams-in-ntfs/`
	`103`	`+ // for details on Alternate Data Streams.`
	`104`	`+ target = filepath.Clean(target)`
	`105`	`+ dir, file := filepath.Split(target)`
	`106`	`+ idf, err := os.Create(filepath.Join(dir, file+":layerid"))`
`106`	`107`	`if err != nil {`
`107`	`108`	`return err`
`108`	`109`	`}`
`@@ -140,7 +141,10 @@ func Unmount(mount string, flags int) error {`
`140`	`141`	`return errors.Wrapf(err, "unable to find mounted volume %s", mount)`
`141`	`142`	`}`
`142`	`143`
`143`		`- layerPathb, err := ioutil.ReadFile(mount + ":layerid")`
	`144`	`+ // Remove any trailing slashes`
	`145`	`+ mount = filepath.Clean(mount)`
	`146`	`+ dir, file := filepath.Split(mount)`
	`147`	`+ layerPathb, err := ioutil.ReadFile(filepath.Join(dir, file+":layerid"))`
`144`	`148`	`if err != nil {`
`145`	`149`	`return err`
`146`	`150`	`}`