X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=rm.c;h=a9501ec7f004c23277b5c913c0657c5f1c8da1d2;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=5663351588ea5df39886ba1f25e3c8c01c8a0a5b;hpb=d27753afd983ffeae45b80dee92f02d0518ca7bf;p=oweals%2Fbusybox.git

diff --git a/rm.c b/rm.c
index 566335158..a9501ec7f 100644
--- a/rm.c
+++ b/rm.c
@@ -37,7 +37,7 @@ static const char *srcName;
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
 	if (unlink(fileName) < 0) {
-		perrorMsg("%s", fileName);
+		perror_msg("%s", fileName);
 		return (FALSE);
 	}
 	return (TRUE);
@@ -47,11 +47,11 @@ static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
 	if (recursiveFlag == FALSE) {
 		errno = EISDIR;
-		perrorMsg("%s", fileName);
+		perror_msg("%s", fileName);
 		return (FALSE);
 	} 
 	if (rmdir(fileName) < 0) {
-		perrorMsg("%s", fileName);
+		perror_msg("%s", fileName);
 		return (FALSE);
 	}
 	return (TRUE);
@@ -101,7 +101,7 @@ extern int rm_main(int argc, char **argv)
 			&& errno == ENOENT) {
 			/* do not reports errors for non-existent files if -f, just skip them */
 		} else {
-			if (recursiveAction(srcName, recursiveFlag, FALSE,
+			if (recursive_action(srcName, recursiveFlag, FALSE,
 								TRUE, fileAction, dirAction, NULL) == FALSE) {
 				status = EXIT_FAILURE;
 			}