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

make directories as neeeded

Browse source
This commit is contained in:
rsc 2005-02-21 15:03:01 +00:00
parent 98660df250
commit f8d580d82b
1 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/cmd/gzip/unzip.c
View file

@ -331,6 +331,32 @@ sunzip(Biobuf *bin)
} }
} }
static int
makedir(char *s)
{
int f;
if (access(s, AEXIST) == 0)
return -1;
f = create(s, OREAD, DMDIR | 0777);
if (f >= 0)
close(f);
return f;
}
static void
mkpdirs(char *s)
{
int done = 0;
char *p = s;
while (!done && (p = strchr(p + 1, '/')) != nil) {
*p = '\0';
done = (access(s, AEXIST) < 0 && makedir(s) < 0);
*p = '/';
}
}
/* /*
* extracts a single entry from a zip file * extracts a single entry from a zip file
* czh is the optional corresponding central directory entry * czh is the optional corresponding central directory entry
@ -379,6 +405,10 @@ unzipEntry(Biobuf *bin, ZipHead *czh)
fd = 1; fd = 1;
}else if(isdir){ }else if(isdir){
fd = create(zh.file, OREAD, DMDIR | 0775); fd = create(zh.file, OREAD, DMDIR | 0775);
if(fd < 0){
mkpdirs(zh.file);
fd = create(zh.file, OREAD, DMDIR | 0775);
}
if(fd < 0){ if(fd < 0){
d = dirstat(zh.file); d = dirstat(zh.file);
if(d == nil || (d->mode & DMDIR) != DMDIR){ if(d == nil || (d->mode & DMDIR) != DMDIR){
@ -389,6 +419,10 @@ unzipEntry(Biobuf *bin, ZipHead *czh)
} }
}else if(ok){ }else if(ok){
fd = create(zh.file, OWRITE, 0664); fd = create(zh.file, OWRITE, 0664);
if(fd < 0){
mkpdirs(zh.file);
fd = create(zh.file, OWRITE, 0664);
}
if(fd < 0){ if(fd < 0){
fprint(2, "unzip: can't create %s: %r\n", zh.file); fprint(2, "unzip: can't create %s: %r\n", zh.file);
ok = 0; ok = 0;