midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Properly report return value in rmdir(1)

This commit is contained in:
FRIGN 2015-01-30 12:43:55 +01:00
parent ae0df49f24
commit a9c7d16cde
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rmdir.c
View File

@ -16,7 +16,7 @@ usage(void)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int pflag = 0; int pflag = 0, ret = 0;
char *d; char *d;
ARGBEGIN { ARGBEGIN {
@ -33,10 +33,9 @@ main(int argc, char *argv[])
for (; argc > 0; argc--, argv++) { for (; argc > 0; argc--, argv++) {
if (rmdir(argv[0]) < 0) { if (rmdir(argv[0]) < 0) {
weprintf("rmdir %s:", argv[0]); weprintf("rmdir %s:", argv[0]);
if (pflag) ret = 1;
return 1;
} }
if (pflag) { if (pflag && !ret) {
d = dirname(argv[0]); d = dirname(argv[0]);
for (; strcmp(d, "/") && strcmp(d, ".") ;) { for (; strcmp(d, "/") && strcmp(d, ".") ;) {
if (rmdir(d) < 0) if (rmdir(d) < 0)
@ -45,5 +44,5 @@ main(int argc, char *argv[])
} }
} }
} }
return 0; return ret;
} }