* Mini rm implementation for busybox
*
*
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include "internal.h"
#include <stdio.h>
#include <time.h>
#include <utime.h>
#include <dirent.h>
#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "busybox.h"
static int recursiveFlag = FALSE;
static int forceFlag = FALSE;
static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
{
if (unlink(fileName) < 0) {
- perror(fileName);
+ perror_msg("%s", fileName);
return (FALSE);
}
return (TRUE);
static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
{
+ if (recursiveFlag == FALSE) {
+ errno = EISDIR;
+ perror_msg("%s", fileName);
+ return (FALSE);
+ }
if (rmdir(fileName) < 0) {
- perror(fileName);
+ perror_msg("%s", fileName);
return (FALSE);
}
return (TRUE);
extern int rm_main(int argc, char **argv)
{
+ int status = EXIT_SUCCESS;
int stopIt=FALSE;
struct stat statbuf;
stopIt = TRUE;
break;
default:
- usage(rm_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc < 1 && forceFlag == FALSE) {
- usage(rm_usage);
+ show_usage();
}
while (argc-- > 0) {
&& 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) {
- exit(FALSE);
+ status = EXIT_FAILURE;
}
}
}
- return(TRUE);
+ return status;
}