o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix dup file name bug

Browse source
This commit is contained in:
rsc 2006-06-26 05:49:18 +00:00
parent ff63eeb1bd
commit 9bc519d686
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cmd/sam/sam.c
View file

@ -532,13 +532,22 @@ cd(String *str)
Strduplstr(&owd, &curwd); Strduplstr(&owd, &curwd);
getcurwd(); getcurwd();
settempfile(); settempfile();
/*
* Two passes so that if we have open
* /a/foo.c and /b/foo.c and cd from /b to /a,
* we don't ever have two foo.c simultaneously.
*/
for(i=0; i<tempfile.nused; i++){ for(i=0; i<tempfile.nused; i++){
f = tempfile.filepptr[i]; f = tempfile.filepptr[i];
if(f!=cmd && f->name.s[0]!='/' && f->name.s[0]!=0){ if(f!=cmd && f->name.s[0]!='/' && f->name.s[0]!=0){
Strinsert(&f->name, &owd, (Posn)0); Strinsert(&f->name, &owd, (Posn)0);
fixname(&f->name); fixname(&f->name);
sortname(f); sortname(f);
}else if(f != cmd && Strispre(&curwd, &f->name)){ }
}
for(i=0; i<tempfile.nused; i++){
f = tempfile.filepptr[i];
if(f != cmd && Strispre(&curwd, &f->name)){
fixname(&f->name); fixname(&f->name);
sortname(f); sortname(f);
} }