DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should be fixed for real now

Browse Source
This commit is contained in:
Pierre Pronchery 2005-04-08 17:05:34 +00:00
parent cb1a91577c
commit 77bf6bed00
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mkdir.c
View File

@ -24,12 +24,9 @@ static int _mkdir(int flagp, mode_t mode, int argc, char * argv[])
if(flagp == 1) if(flagp == 1)
{ {
if(_mkdir_p(mode, argv[i]) != 0) if(_mkdir_p(mode, argv[i]) != 0)
{
res = 2; res = 2;
continue;
} }
} else if(mkdir(argv[i], mode) != 0)
if(mkdir(argv[i], mode) != 0)
res = _mkdir_error(argv[i], 2); res = _mkdir_error(argv[i], 2);
} }
return res; return res;
@ -45,20 +42,23 @@ static int _mkdir_error(char * message, int ret)
static int _mkdir_p(mode_t mode, char * pathname) static int _mkdir_p(mode_t mode, char * pathname)
{ {
char * p; char * p;
char c;
struct stat st; struct stat st;
for(p = pathname; *p != '\0'; p++) for(p = pathname; *p != '\0'; p++)
{ {
if(*p != '/') if(*p != '/')
continue; continue;
c = *p;
*p = '\0'; *p = '\0';
if(!(stat(pathname, &st) == 0 && S_ISDIR(st.st_mode)) if(!(stat(pathname, &st) == 0 && S_ISDIR(st.st_mode))
&& mkdir(pathname, mode) == -1) && mkdir(pathname, mode) == -1)
return _mkdir_error(pathname, 2); return _mkdir_error(pathname, 2);
*p = c; for(*p++ = '/'; *p == '/'; p++);
if(*p == '\0')
return 0;
} }
if(!(stat(pathname, &st) == 0 && S_ISDIR(st.st_mode))
&& mkdir(pathname, mode) == -1)
return _mkdir_error(pathname, 2);
return 0; return 0;
} }