diff options
Diffstat (limited to 'rm.c')
| -rw-r--r-- | rm.c | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -37,7 +37,7 @@ static const char *srcName; | |||
| 37 | static int fileAction(const char *fileName, struct stat *statbuf, void* junk) | 37 | static int fileAction(const char *fileName, struct stat *statbuf, void* junk) |
| 38 | { | 38 | { |
| 39 | if (unlink(fileName) < 0) { | 39 | if (unlink(fileName) < 0) { |
| 40 | perrorMsg("%s", fileName); | 40 | perror_msg("%s", fileName); |
| 41 | return (FALSE); | 41 | return (FALSE); |
| 42 | } | 42 | } |
| 43 | return (TRUE); | 43 | return (TRUE); |
| @@ -47,11 +47,11 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk) | |||
| 47 | { | 47 | { |
| 48 | if (recursiveFlag == FALSE) { | 48 | if (recursiveFlag == FALSE) { |
| 49 | errno = EISDIR; | 49 | errno = EISDIR; |
| 50 | perrorMsg("%s", fileName); | 50 | perror_msg("%s", fileName); |
| 51 | return (FALSE); | 51 | return (FALSE); |
| 52 | } | 52 | } |
| 53 | if (rmdir(fileName) < 0) { | 53 | if (rmdir(fileName) < 0) { |
| 54 | perrorMsg("%s", fileName); | 54 | perror_msg("%s", fileName); |
| 55 | return (FALSE); | 55 | return (FALSE); |
| 56 | } | 56 | } |
| 57 | return (TRUE); | 57 | return (TRUE); |
| @@ -101,7 +101,7 @@ extern int rm_main(int argc, char **argv) | |||
| 101 | && errno == ENOENT) { | 101 | && errno == ENOENT) { |
| 102 | /* do not reports errors for non-existent files if -f, just skip them */ | 102 | /* do not reports errors for non-existent files if -f, just skip them */ |
| 103 | } else { | 103 | } else { |
| 104 | if (recursiveAction(srcName, recursiveFlag, FALSE, | 104 | if (recursive_action(srcName, recursiveFlag, FALSE, |
| 105 | TRUE, fileAction, dirAction, NULL) == FALSE) { | 105 | TRUE, fileAction, dirAction, NULL) == FALSE) { |
| 106 | status = EXIT_FAILURE; | 106 | status = EXIT_FAILURE; |
| 107 | } | 107 | } |