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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2005-04-09 21:05:45 +00:00
parent 229e91461f
commit 06bf7ae78c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rmdir.c
View File

@ -7,6 +7,7 @@
/* rmdir */ /* rmdir */
static int _rmdir_error(char * message, int ret);
static int _rmdir_p(char * pathname); static int _rmdir_p(char * pathname);
static int _rmdir(int flagp, int argc, char * argv[]) static int _rmdir(int flagp, int argc, char * argv[])
{ {
@ -17,9 +18,7 @@ static int _rmdir(int flagp, int argc, char * argv[])
{ {
if(rmdir(argv[i]) == -1) if(rmdir(argv[i]) == -1)
{ {
fprintf(stderr, "%s", "rmdir: "); res = _rmdir_error(argv[i], 2);
perror(argv[i]);
res = 2;
continue; continue;
} }
if(flagp) if(flagp)
@ -31,6 +30,13 @@ static int _rmdir(int flagp, int argc, char * argv[])
return res; return res;
} }
static int _rmdir_error(char * message, int ret)
{
fprintf(stderr, "%s", "rmdir: ");
perror(message);
return ret;
}
static int _rmdir_p(char * pathname) static int _rmdir_p(char * pathname)
{ {
char * str; char * str;
@ -43,11 +49,7 @@ static int _rmdir_p(char * pathname)
continue; continue;
*str = '\0'; *str = '\0';
if(rmdir(pathname) == -1) if(rmdir(pathname) == -1)
{ return _rmdir_error(pathname, 2);
fprintf(stderr, "%s", "rmdir: ");
perror(pathname);
return -1;
}
} }
return 0; return 0;
} }