aboutsummaryrefslogtreecommitdiff
path: root/rm.c
diff options
context:
space:
mode:
authorerik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-28 00:58:14 +0000
committererik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-03-28 00:58:14 +0000
commit040468363becb832f77036a5de1276d9fdd34e13 (patch)
tree36b57afb6f3eefcdc8fdaf40e51fa6956264db50 /rm.c
parent943443ecbd7fb41f08fe551aa7695a3ae7a9eb3d (diff)
downloadbusybox-w32-040468363becb832f77036a5de1276d9fdd34e13.tar.gz
busybox-w32-040468363becb832f77036a5de1276d9fdd34e13.tar.bz2
busybox-w32-040468363becb832f77036a5de1276d9fdd34e13.zip
Yet another installment in the ongoing tar saga
-Erik git-svn-id: svn://busybox.net/trunk/busybox@424 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'rm.c')
-rw-r--r--rm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rm.c b/rm.c
index 41afedaf9..683bf8bdf 100644
--- a/rm.c
+++ b/rm.c
@@ -42,7 +42,7 @@ static int forceFlag = FALSE;
42static const char *srcName; 42static const char *srcName;
43 43
44 44
45static int fileAction(const char *fileName, struct stat *statbuf) 45static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
46{ 46{
47 if (unlink(fileName) < 0) { 47 if (unlink(fileName) < 0) {
48 perror(fileName); 48 perror(fileName);
@@ -51,7 +51,7 @@ static int fileAction(const char *fileName, struct stat *statbuf)
51 return (TRUE); 51 return (TRUE);
52} 52}
53 53
54static int dirAction(const char *fileName, struct stat *statbuf) 54static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
55{ 55{
56 if (rmdir(fileName) < 0) { 56 if (rmdir(fileName) < 0) {
57 perror(fileName); 57 perror(fileName);
@@ -95,7 +95,7 @@ extern int rm_main(int argc, char **argv)
95 /* do not reports errors for non-existent files if -f, just skip them */ 95 /* do not reports errors for non-existent files if -f, just skip them */
96 } else { 96 } else {
97 if (recursiveAction(srcName, recursiveFlag, FALSE, 97 if (recursiveAction(srcName, recursiveFlag, FALSE,
98 TRUE, fileAction, dirAction) == FALSE) { 98 TRUE, fileAction, dirAction, NULL) == FALSE) {
99 exit(FALSE); 99 exit(FALSE);
100 } 100 }
101 } 101 }