qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 01:34:41 -07:00
Code Releases Activity

os: fix os.MkdirAll with backslash path separator.

Browse Source 
MkdirAll() need to use isSeparator().
Move primary defines of filepath.Separator/filepath.ListSeparator
 to os.PathSeparator/os.PathListSeparator.
Move filepath.isSeparator() to os.IsPathSeparator().
filepath package refer them from os package.
Fixes #1831.

R=rsc, alex.brainman
CC=golang-dev
https://golang.org/cl/4535100
This commit is contained in:
Yasuhiro Matsumoto 2011-05-29 13:03:49 +10:00 committed by Alex Brainman
parent 505f0bb3ce
commit 0f4510b370
10 changed files with 81 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/os/Makefile
View File

@ -23,6 +23,7 @@ GOFILES_freebsd=\
env_unix.go\
file_posix.go\
file_unix.go\
path_unix.go\
sys_bsd.go\
exec_posix.go\
exec_unix.go\
@ -33,6 +34,7 @@ GOFILES_darwin=\
env_unix.go\
file_posix.go\
file_unix.go\
path_unix.go\
sys_bsd.go\
exec_posix.go\
exec_unix.go\
@ -43,6 +45,7 @@ GOFILES_linux=\
env_unix.go\
file_posix.go\
file_unix.go\
path_unix.go\
sys_linux.go\
exec_posix.go\
exec_unix.go\
@ -53,6 +56,7 @@ GOFILES_windows=\
env_windows.go\
file_posix.go\
file_windows.go\
path_windows.go\
sys_windows.go\
exec_posix.go\
exec_windows.go\
@ -62,6 +66,7 @@ GOFILES_plan9=\
error_plan9.go\
env_plan9.go\
file_plan9.go\
path_plan9.go\
sys_plan9.go\
exec_plan9.go\

6
src/pkg/os/path.go
View File

@ -24,12 +24,12 @@ func MkdirAll(path string, perm uint32) Error {
// Doesn't already exist; make sure parent does.
i := len(path)
for i > 0 && path[i-1] == '/' { // Skip trailing slashes.
for i > 0 && IsPathSeparator(path[i-1]) { // Skip trailing path separator.
i--
}
j := i
for j > 0 && path[j-1] != '/' { // Scan backward over element.
for j > 0 && !IsPathSeparator(path[j-1]) { // Scan backward over element.
j--
}
@ -90,7 +90,7 @@ func RemoveAll(path string) Error {
for {
names, err1 := fd.Readdirnames(100)
for _, name := range names {
err1 := RemoveAll(path + "/" + name)
err1 := RemoveAll(path + string(PathSeparator) + name)
if err == nil {
err = err1
}

15
src/pkg/os/path_plan9.go Normal file
View File

@ -0,0 +1,15 @@
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package os
const (
PathSeparator = '/' // OS-specific path separator
PathListSeparator = 0 // OS-specific path list separator
)
// IsPathSeparator returns true if c is a directory separator character.
func IsPathSeparator(c uint8) bool {
return PathSeparator == c
}

17
src/pkg/os/path_test.go
View File

@ -6,6 +6,7 @@ package os_test
import (
. "os"
"path/filepath"
"testing"
"runtime"
"syscall"
@ -44,8 +45,8 @@ func TestMkdirAll(t *testing.T) {
if !ok {
t.Fatalf("MkdirAll %q returned %T, not *PathError", fpath, err)
}
if perr.Path != fpath {
t.Fatalf("MkdirAll %q returned wrong error path: %q not %q", fpath, perr.Path, fpath)
if filepath.Clean(perr.Path) != filepath.Clean(fpath) {
t.Fatalf("MkdirAll %q returned wrong error path: %q not %q", fpath, filepath.Clean(perr.Path), filepath.Clean(fpath))
}
// Can't make subdirectory of file.
@ -58,8 +59,16 @@ func TestMkdirAll(t *testing.T) {
if !ok {
t.Fatalf("MkdirAll %q returned %T, not *PathError", ffpath, err)
}
if perr.Path != fpath {
t.Fatalf("MkdirAll %q returned wrong error path: %q not %q", ffpath, perr.Path, fpath)
if filepath.Clean(perr.Path) != filepath.Clean(fpath) {
t.Fatalf("MkdirAll %q returned wrong error path: %q not %q", ffpath, filepath.Clean(perr.Path), filepath.Clean(fpath))
}
if syscall.OS == "windows" {
path := `_test\_TestMkdirAll_\dir\.\dir2\`
err := MkdirAll(path, 0777)
if err != nil {
t.Fatalf("MkdirAll %q: %s", path, err)
}
}
}

15
src/pkg/os/path_unix.go Normal file
View File

@ -0,0 +1,15 @@
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package os
const (
PathSeparator = '/' // OS-specific path separator
PathListSeparator = ':' // OS-specific path list separator
)
// IsPathSeparator returns true if c is a directory separator character.
func IsPathSeparator(c uint8) bool {
return PathSeparator == c
}

16
src/pkg/os/path_windows.go Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package os
const (
PathSeparator = '\\' // OS-specific path separator
PathListSeparator = ':' // OS-specific path list separator
)
// IsPathSeparator returns true if c is a directory separator character.
func IsPathSeparator(c uint8) bool {
// NOTE: Windows accept / as path separator.
return c == '\\' || c == '/'
}

20
src/pkg/path/filepath/path.go
View File

@ -15,6 +15,8 @@ import (
)
const (
Separator = os.PathSeparator
ListSeparator = os.PathListSeparator
SeparatorString = string(Separator)
ListSeparatorString = string(ListSeparator)
)
@ -61,20 +63,20 @@ func Clean(path string) string {
for r < n {
switch {
case isSeparator(path[r]):
case os.IsPathSeparator(path[r]):
// empty path element
r++
case path[r] == '.' && (r+1 == n || isSeparator(path[r+1])):
case path[r] == '.' && (r+1 == n || os.IsPathSeparator(path[r+1])):
// . element
r++
case path[r] == '.' && path[r+1] == '.' && (r+2 == n || isSeparator(path[r+2])):
case path[r] == '.' && path[r+1] == '.' && (r+2 == n || os.IsPathSeparator(path[r+2])):
// .. element: remove to last separator
r += 2
switch {
case w > dotdot:
// can backtrack
w--
for w > dotdot && !isSeparator(buf[w]) {
for w > dotdot && !os.IsPathSeparator(buf[w]) {
w--
}
case !rooted:
@ -97,7 +99,7 @@ func Clean(path string) string {
w++
}
// copy element
for ; r < n && !isSeparator(path[r]); r++ {
for ; r < n && !os.IsPathSeparator(path[r]); r++ {
buf[w] = path[r]
w++
}
@ -145,7 +147,7 @@ func SplitList(path string) []string {
// and file set to path.
func Split(path string) (dir, file string) {
i := len(path) - 1
for i >= 0 && !isSeparator(path[i]) {
for i >= 0 && !os.IsPathSeparator(path[i]) {
i--
}
return path[:i+1], path[i+1:]
@ -167,7 +169,7 @@ func Join(elem ...string) string {
// in the final element of path; it is empty if there is
// no dot.
func Ext(path string) string {
for i := len(path) - 1; i >= 0 && !isSeparator(path[i]); i-- {
for i := len(path) - 1; i >= 0 && !os.IsPathSeparator(path[i]); i-- {
if path[i] == '.' {
return path[i:]
}
@ -339,12 +341,12 @@ func Base(path string) string {
return "."
}
// Strip trailing slashes.
for len(path) > 0 && isSeparator(path[len(path)-1]) {
for len(path) > 0 && os.IsPathSeparator(path[len(path)-1]) {
path = path[0 : len(path)-1]
}
// Find the last element
i := len(path) - 1
for i >= 0 && !isSeparator(path[i]) {
for i >= 0 && !os.IsPathSeparator(path[i]) {
i--
}
if i >= 0 {

10
src/pkg/path/filepath/path_plan9.go
View File

@ -6,16 +6,6 @@ package filepath
import "strings"
const (
Separator = '/' // OS-specific path separator
ListSeparator = 0 // OS-specific path list separator
)
// isSeparator returns true if c is a directory separator character.
func isSeparator(c uint8) bool {
return Separator == c
}
// IsAbs returns true if the path is absolute.
func IsAbs(path string) bool {
return strings.HasPrefix(path, "/") || strings.HasPrefix(path, "#")

10
src/pkg/path/filepath/path_unix.go
View File

@ -6,16 +6,6 @@ package filepath
import "strings"
const (
Separator = '/' // OS-specific path separator
ListSeparator = ':' // OS-specific path list separator
)
// isSeparator returns true if c is a directory separator character.
func isSeparator(c uint8) bool {
return Separator == c
}
// IsAbs returns true if the path is absolute.
func IsAbs(path string) bool {
return strings.HasPrefix(path, "/")

15
src/pkg/path/filepath/path_windows.go
View File

@ -4,20 +4,11 @@
package filepath
const (
Separator = '\\' // OS-specific path separator
ListSeparator = ':' // OS-specific path list separator
)
// isSeparator returns true if c is a directory separator character.
func isSeparator(c uint8) bool {
// NOTE: Windows accept / as path separator.
return c == '\\' || c == '/'
}
import "os"
// IsAbs returns true if the path is absolute.
func IsAbs(path string) bool {
return path != "" && (volumeName(path) != "" || isSeparator(path[0]))
return path != "" && (volumeName(path) != "" || os.IsPathSeparator(path[0]))
}
// volumeName return leading volume name.
@ -28,7 +19,7 @@ func volumeName(path string) string {
}
// with drive letter
c := path[0]
if len(path) > 2 && path[1] == ':' && isSeparator(path[2]) &&
if len(path) > 2 && path[1] == ':' && os.IsPathSeparator(path[2]) &&
('0' <= c && c <= '9' || 'a' <= c && c <= 'z' ||
'A' <= c && c <= 'Z') {
return path[0:2]