Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/rmdir.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/rmdir.c (modified) (6 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <libgen.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+
+int rmdir_main(int argc, char **argv);
 int rmdir_main(int argc, char **argv)
 {
@@ -36 +25 @@
     char *path;
 
-    flags = bb_getopt_ulflags(argc, argv, "p");
-
+    flags = getopt32(argv, "p");
     argv += optind;
 
@@ -50 +38 @@
         do_dot = (*path == '.');
 
-        do {
+        while (1) {
             if (rmdir(path) < 0) {
-                bb_perror_msg("`%s'", path);    /* Match gnu rmdir msg. */
+                bb_perror_msg("'%s'", path);    /* Match gnu rmdir msg. */
                 status = EXIT_FAILURE;
             } else if (flags) {
@@ -60 +48 @@
                  * returns "." if there are no parents.  We must distinguish
                  * this from the case of the original path starting with '.'.
-         */
+                 */
                 if (do_dot || (*path != '.') || path[1]) {
                     continue;
@@ -66 +54 @@
             }
             break;
-        } while (1);
+        }
 
     } while (*++argv);