Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

throw away . and .. in directory listings

Browse source 
R=r
DELTA=13  (11 added, 0 deleted, 2 changed)
OCL=27147
CL=27154
This commit is contained in:
Russ Cox 2009-04-07 00:40:50 -07:00
parent 61ba160120
commit f13ce3ab34
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/os/dir_amd64_darwin.go
View file

@ -50,6 +50,10 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
if dirent.Ino == 0 { // File absent in directory. if dirent.Ino == 0 { // File absent in directory.
continue continue
} }
var name = string(dirent.Name[0:dirent.Namlen]);
if name == "." || name == ".." { // Useless names
continue
}
count--; count--;
if len(names) == cap(names) { if len(names) == cap(names) {
nnames := make([]string, len(names), 2*len(names)); nnames := make([]string, len(names), 2*len(names));
@ -59,7 +63,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
names = nnames; names = nnames;
} }
names = names[0:len(names)+1]; names = names[0:len(names)+1];
names[len(names)-1] = string(dirent.Name[0:dirent.Namlen]); names[len(names)-1] = name;
} }
} }
return names, nil return names, nil

6
src/lib/os/dir_amd64_linux.go
View file

@ -59,6 +59,10 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
if dirent.Ino == 0 { // File absent in directory. if dirent.Ino == 0 { // File absent in directory.
continue continue
} }
var name = string(dirent.Name[0:clen(dirent.Namlen)]);
if name == "." || name == ".." { // Useless names
continue
}
count--; count--;
if len(names) == cap(names) { if len(names) == cap(names) {
nnames := make([]string, len(names), 2*len(names)); nnames := make([]string, len(names), 2*len(names));
@ -68,7 +72,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
names = nnames; names = nnames;
} }
names = names[0:len(names)+1]; names = names[0:len(names)+1];
names[len(names)-1] = string(dirent.Name[0:clen(dirent.Name)]); names[len(names)-1] = name;
} }
} }
return names, nil; return names, nil;

3
src/lib/os/os_test.go
View file

@ -110,6 +110,9 @@ func testReaddirnames(dir string, contents []string, t *testing.T) {
for i, m := range contents { for i, m := range contents {
found := false; found := false;
for j, n := range s { for j, n := range s {
if n == "." || n == ".." {
t.Errorf("got %s in directory", n);
}
if m == n { if m == n {
if found { if found {
t.Error("present twice:", m); t.Error("present twice:", m);