X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Frm.c;h=975f2267b1f219cfd427601b2707e0654c0b009f;hb=6b1e3d7e734f85a08c2e4414764f03a7f880b3e6;hp=e4e9bb0be48631471db33c38d58717d56aacb214;hpb=27421a1878847389391c1a43420baaccf57057a7;p=oweals%2Fbusybox.git

diff --git a/coreutils/rm.c b/coreutils/rm.c
index e4e9bb0be..975f2267b 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,21 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -29,30 +15,33 @@
  * Size reduction.
  */
 
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
 
-extern int rm_main(int argc, char **argv)
+int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rm_main(int argc UNUSED_PARAM, char **argv)
 {
 	int status = 0;
 	int flags = 0;
-	unsigned long opt;
-
-	bb_opt_complementally = "f-i:i-f";
-	opt = bb_getopt_ulflags(argc, argv, "fiRr");
-	if(opt & 1)
-				flags |= FILEUTILS_FORCE;
-	if(opt & 2)
+	unsigned opt;
+
+	opt_complementary = "f-i:i-f";
+	opt = getopt32(argv, "fiRr");
+	argv += optind;
+	if (opt & 1)
+		flags |= FILEUTILS_FORCE;
+	if (opt & 2)
 		flags |= FILEUTILS_INTERACTIVE;
-	if(opt & 12)
+	if (opt & 12)
 		flags |= FILEUTILS_RECUR;
 
-	if (*(argv += optind) != NULL) {
+	if (*argv != NULL) {
 		do {
-			const char *base = bb_get_last_path_component(*argv);
+			const char *base = bb_get_last_path_component_strip(*argv);
 
-			if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
-				bb_error_msg("cannot remove `.' or `..'");
+			if (DOT_OR_DOTDOT(base)) {
+				bb_error_msg("cannot remove '.' or '..'");
 			} else if (remove_file(*argv, flags) >= 0) {
 				continue;
 			}