preparatory patch for -Wwrite-strings #2

[oweals/busybox.git] / util-linux / switch_root.c

diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index e21838b653336832b516812447dd5d18bff0ff54..007083bef4db629ec05d8a94412cb15ac973dae4 100644 (file)
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -1,15 +1,14 @@
-/* vi:set ts=4:*/
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/vfs.h>
-#include <unistd.h>
+/* vi: set sw=4 ts=4: */
+/* Copyright 2005 Rob Landley <rob@landley.net>
+ *
+ * Switch from rootfs to another filesystem as the root of the mount tree.
+ *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ */
 
 #include "busybox.h"
+#include <sys/vfs.h>
+
 
 // Make up for header deficiencies.
 
@@ -29,14 +28,14 @@ dev_t rootdev;
 
 // Recursively delete contents of rootfs.
 
-static void delete_contents(char *directory)
+static void delete_contents(const char *directory)
 {
        DIR *dir;
        struct dirent *d;
        struct stat st;
 
        // Don't descend into other filesystems
-       if (lstat(directory,&st) || st.st_dev != rootdev) return;
+       if (lstat(directory, &st) || st.st_dev != rootdev) return;
 
        // Recursively delete the contents of directories.
        if (S_ISDIR(st.st_mode)) {
@@ -72,8 +71,8 @@ int switch_root_main(int argc, char *argv[])
 
        // Parse args (-c console)
 
-       bb_opt_complementally="-2";
-       bb_getopt_ulflags(argc,argv,"c:",&console);
+       opt_complementary = "-2";
+       getopt32(argc, argv, "c:", &console);
 
        // Change to new root directory and verify it's a different fs.
 
@@ -82,7 +81,7 @@ int switch_root_main(int argc, char *argv[])
        if (chdir(newroot) || lstat(".", &st1) || lstat("/", &st2) ||
                st1.st_dev == st2.st_dev)
        {
-               bb_error_msg_and_die("bad newroot %s",newroot);
+               bb_error_msg_and_die("bad newroot %s", newroot);
        }
        rootdev=st2.st_dev;
 
@@ -112,12 +111,12 @@ int switch_root_main(int argc, char *argv[])
        if (console) {
                close(0);
                if(open(console, O_RDWR) < 0)
-                       bb_error_msg_and_die("Bad console '%s'",console);
+                       bb_error_msg_and_die("bad console '%s'", console);
                dup2(0, 1);
                dup2(0, 2);
        }
 
        // Exec real init.  (This is why we must be pid 1.)
-       execv(argv[optind],argv+optind);
-       bb_error_msg_and_die("Bad init '%s'",argv[optind]);
+       execv(argv[optind], argv+optind);
+       bb_error_msg_and_die("bad init '%s'", argv[optind]);
 }