Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/rm.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/rm.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/rm.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -30 +16 @@
  */
 
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int rm_main(int argc, char **argv);
 int rm_main(int argc, char **argv)
 {
     int status = 0;
     int flags = 0;
-    unsigned long opt;
+    unsigned opt;
 
-    bb_opt_complementally = "f-i:i-f";
-    opt = bb_getopt_ulflags(argc, argv, "fiRr");
-    if(opt & 1)
-                flags |= FILEUTILS_FORCE;
-    if(opt & 2)
+    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);
 
-            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;