projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reorder include <sys/types.h> and <sys/types.h>.
[oweals/busybox.git]
/
coreutils
/
rm.c
diff --git
a/coreutils/rm.c
b/coreutils/rm.c
index 477d3af598bfe09d012ec606b49e80101b234fbe..e4e9bb0be48631471db33c38d58717d56aacb214 100644
(file)
--- a/
coreutils/rm.c
+++ b/
coreutils/rm.c
@@
-1,7
+1,9
@@
+/* vi: set sw=4 ts=4: */
/*
* Mini rm implementation for busybox
*
/*
* Mini rm implementation for busybox
*
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ *
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-19,75
+21,46
@@
*
*/
*
*/
-#include "internal.h"
-#include <stdio.h>
-#include <time.h>
-#include <utime.h>
-#include <dirent.h>
-
-static const char* rm_usage = "Usage: rm [OPTION]... FILE...\n"
-"Remove (unlink) the FILE(s).\n\n"
-"\t-f\tremove existing destinations, never prompt\n"
-"\t-r\tremove the contents of directories recursively\n";
-
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/rm.html */
-static int recursiveFlag = FALSE;
-static int forceFlag = FALSE;
-static const char *srcName;
-
-
-static int fileAction(const char *fileName, struct stat* statbuf)
-{
- if (unlink( fileName) < 0 ) {
- perror( fileName);
- return ( FALSE);
- }
- return ( TRUE);
-}
+/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
+ *
+ * Size reduction.
+ */
-static int dirAction(const char *fileName, struct stat* statbuf)
-{
- if (rmdir( fileName) < 0 ) {
- perror( fileName);
- return ( FALSE);
- }
- return ( TRUE);
-}
+#include <unistd.h>
+#include "busybox.h"
extern int rm_main(int argc, char **argv)
{
extern int rm_main(int argc, char **argv)
{
+ int status = 0;
+ int flags = 0;
+ unsigned long opt;
- if (argc < 2) {
- fprintf(stderr, "Usage: %s", rm_usage);
- exit (FALSE);
- }
- argc--;
- argv++;
+ bb_opt_complementally = "f-i:i-f";
+ opt = bb_getopt_ulflags(argc, argv, "fiRr");
+ if(opt & 1)
+ flags |= FILEUTILS_FORCE;
+ if(opt & 2)
+ flags |= FILEUTILS_INTERACTIVE;
+ if(opt & 12)
+ flags |= FILEUTILS_RECUR;
- /* Parse any options */
- while (**argv == '-') {
- while (*++(*argv))
- switch (**argv) {
- case 'r':
- recursiveFlag = TRUE;
- break;
- case 'f':
- forceFlag = TRUE;
- break;
- default:
- fprintf(stderr, "Usage: %s\n", rm_usage);
- exit(FALSE);
- }
- argc--;
- argv++;
- }
+ if (*(argv += optind) != NULL) {
+ do {
+ const char *base = bb_get_last_path_component(*argv);
- while (argc-- > 0) {
- srcName = *(argv++);
- if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE,
- fileAction, dirAction) == FALSE) {
- exit( FALSE);
+ if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
+ bb_error_msg("cannot remove `.' or `..'");
+ } else if (remove_file(*argv, flags) >= 0) {
+ continue;
+ }
+ status = 1;
+ } while (*++argv);
+ } else if (!(flags & FILEUTILS_FORCE)) {
+ bb_show_usage();
}
}
- }
-
exit( TRUE)
;
+
+
return status
;
}
}