github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

use built-in path separator instead of hard coded

Browse Source
This commit is contained in:
Di Xu 2017-07-09 23:24:34 +08:00
parent 5ca03d674e
commit a76ccf5a5a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/util/atomic_writer.go
View File

@ -311,11 +311,7 @@ func (w *AtomicWriter) pathsToRemove(payload map[string]FileProjection) (sets.St
} }
relativePath := strings.TrimPrefix(path, w.targetDir) relativePath := strings.TrimPrefix(path, w.targetDir)
if runtime.GOOS == "windows" { relativePath = strings.TrimPrefix(relativePath, string(os.PathSeparator))
relativePath = strings.TrimPrefix(relativePath, "\\")
} else {
relativePath = strings.TrimPrefix(relativePath, "/")
}
if strings.HasPrefix(relativePath, "..") { if strings.HasPrefix(relativePath, "..") {
return nil return nil
} }
@ -339,7 +335,7 @@ func (w *AtomicWriter) pathsToRemove(payload map[string]FileProjection) (sets.St
for subPath := file; subPath != ""; { for subPath := file; subPath != ""; {
newPaths.Insert(subPath) newPaths.Insert(subPath)
subPath, _ = filepath.Split(subPath) subPath, _ = filepath.Split(subPath)
subPath = strings.TrimSuffix(subPath, "/") subPath = strings.TrimSuffix(subPath, string(os.PathSeparator))
} }
} }
glog.V(5).Infof("%s: new paths: %+v", w.targetDir, newPaths.List()) glog.V(5).Infof("%s: new paths: %+v", w.targetDir, newPaths.List())
@ -424,7 +420,7 @@ func (w *AtomicWriter) createUserVisibleFiles(payload map[string]FileProjection)
// Since filepath.Split leaves a trailing path separator, in this // Since filepath.Split leaves a trailing path separator, in this
// example, dir = "foo/". In order to calculate the number of // example, dir = "foo/". In order to calculate the number of
// subdirectories, we must subtract 1 from the number returned by split. // subdirectories, we must subtract 1 from the number returned by split.
subDirs = len(strings.Split(dir, "/")) - 1 subDirs = len(strings.Split(dir, string(os.PathSeparator))) - 1
err := os.MkdirAll(path.Join(w.targetDir, dir), os.ModePerm) err := os.MkdirAll(path.Join(w.targetDir, dir), os.ModePerm)
if err != nil { if err != nil {
return err return err