xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cp: fix filpath length limitation

Browse source
This commit is contained in:
cinap_lenrek 2011-06-08 00:44:39 +00:00
parent 8c8b19cec7
commit 6feb869371
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sys/src/cmd/cp.c
View file

@ -78,51 +78,48 @@ void
copy(char *from, char *to, int todir) copy(char *from, char *to, int todir)
{ {
Dir *dirb, dirt; Dir *dirb, dirt;
char name[256]; char *name;
int fdf, fdt, mode; int fdf, fdt, mode;
name = nil;
if(todir){ if(todir){
char *s, *elem; char *s, *elem;
elem=s=from; elem=s=from;
while(*s++) while(*s++)
if(s[-1]=='/') if(s[-1]=='/')
elem=s; elem=s;
sprint(name, "%s/%s", to, elem); name = smprint("%s/%s", to, elem);
to=name; to = name;
} }
fdf = fdt = -1;
if((dirb=dirstat(from))==nil){ if((dirb=dirstat(from))==nil){
fprint(2,"cp: can't stat %s: %r\n", from); fprint(2,"cp: can't stat %s: %r\n", from);
failed = 1; failed = 1;
return; goto out;
} }
mode = dirb->mode; mode = dirb->mode;
if(mode&DMDIR){ if(mode&DMDIR){
fprint(2, "cp: %s is a directory\n", from); fprint(2, "cp: %s is a directory\n", from);
free(dirb);
failed = 1; failed = 1;
return; goto out;
} }
if(samefile(dirb, from, to)){ if(samefile(dirb, from, to)){
free(dirb);
failed = 1; failed = 1;
return; goto out;
} }
mode &= 0777; mode &= 0777;
fdf=open(from, OREAD); fdf=open(from, OREAD);
if(fdf<0){ if(fdf<0){
fprint(2, "cp: can't open %s: %r\n", from); fprint(2, "cp: can't open %s: %r\n", from);
free(dirb);
failed = 1; failed = 1;
return; goto out;
} }
fdt=create(to, OWRITE, mode); fdt=create(to, OWRITE, mode);
if(fdt<0){ if(fdt<0){
fprint(2, "cp: can't create %s: %r\n", to); fprint(2, "cp: can't create %s: %r\n", to);
close(fdf);
free(dirb);
failed = 1; failed = 1;
return; goto out;
} }
if(copy1(fdf, fdt, from, to)==0 && (xflag || gflag || uflag)){ if(copy1(fdf, fdt, from, to)==0 && (xflag || gflag || uflag)){
nulldir(&dirt); nulldir(&dirt);
@ -137,9 +134,13 @@ copy(char *from, char *to, int todir)
if(dirfwstat(fdt, &dirt) < 0) if(dirfwstat(fdt, &dirt) < 0)
fprint(2, "cp: warning: can't wstat %s: %r\n", to); fprint(2, "cp: warning: can't wstat %s: %r\n", to);
} }
out:
free(dirb); free(dirb);
close(fdf); if(fdf >= 0)
close(fdt); close(fdf);
if(fdt >= 0)
close(fdt);
free(name);
} }
int int