*
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <time.h>
#include <utime.h>
#include <dirent.h>
#include <errno.h>
-
-static const char *rm_usage = "rm [OPTION]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nRemove (unlink) the FILE(s). You may use '--' to\n"
- "indicate that all following arguments are non-options.\n\n"
- "Options:\n"
- "\t-f\t\tremove existing destinations, never prompt\n"
- "\t-r or -R\tremove the contents of directories recursively\n"
-#endif
- ;
-
+#include <unistd.h>
+#include <stdlib.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;
- if (argc < 2) {
- usage(rm_usage);
- }
+ argc--;
argv++;
/* Parse any options */
- while (--argc >= 0 && *argv && **argv && stopIt==FALSE) {
- while (**argv == '-') {
+ while (argc > 0 && stopIt == FALSE) {
+ if (**argv == '-') {
while (*++(*argv))
switch (**argv) {
case 'R':
default:
usage(rm_usage);
}
+ argc--;
+ argv++;
}
- argv++;
+ else
+ break;
+ }
+
+ if (argc < 1 && forceFlag == FALSE) {
+ usage(rm_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;
}
}
}
- exit(TRUE);
+ return status;
}