Remove debugging statement.

[oweals/busybox.git] / mount.c

diff --git a/mount.c b/mount.c
index 9d61bd3e30179f3d770a50cf51fafa6780a59e12..9c438bf6c9a9e41477b4aa2452f5c251297fc6b1 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -70,6 +70,7 @@ enum {
        S_IMMUTABLE = 512,     /* Immutable file */
        MS_NOATIME = 1024,    /* Do not update access times. */
        MS_NODIRATIME = 2048,    /* Do not update directory access times */
+       MS_BIND = 4096,    /* Use the new linux 2.4.x "mount --bind" feature */
 };
 
 
@@ -112,13 +113,14 @@ static const struct mount_options mount_options[] = {
        {"rw", ~MS_RDONLY, 0},
        {"suid", ~MS_NOSUID, 0},
        {"sync", ~0, MS_SYNCHRONOUS},
+       {"bind", ~0, MS_BIND},
        {0, 0, 0}
 };
 
 static int
 do_mount(char *specialfile, char *dir, char *filesystemtype,
                 long flags, void *string_flags, int useMtab, int fakeIt,
-                char *mtab_opts)
+                char *mtab_opts, int mount_all)
 {
        int status = 0;
 #if defined BB_FEATURE_MOUNT_LOOP
@@ -142,15 +144,18 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
                        }
                        if (!(flags & MS_RDONLY) && loro) {     /* loop is ro, but wanted rw */
                                error_msg("WARNING: loop device is read-only");
-                               flags &= ~MS_RDONLY;
+                               flags |= MS_RDONLY;
                        }
                }
 #endif
                status = mount(specialfile, dir, filesystemtype, flags, string_flags);
-               if (errno == EROFS) {
+               if (status < 0 && errno == EROFS) {
                        error_msg("%s is write-protected, mounting read-only", specialfile);
                        status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
                }
+               /* Don't whine about already mounted filesystems when mounting all. */
+               if (status < 0 && errno == EBUSY && mount_all)
+                       return TRUE;
        }
 
 
@@ -231,7 +236,7 @@ parse_mount_options(char *options, int *flags, char *strflags)
 extern int
 mount_one(char *blockDevice, char *directory, char *filesystemType,
                  unsigned long flags, char *string_flags, int useMtab, int fakeIt,
-                 char *mtab_opts, int whineOnErrors)
+                 char *mtab_opts, int whineOnErrors, int mount_all)
 {
        int status = 0;
 
@@ -254,7 +259,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
                        if (!*noauto_fstype) {
                                status = do_mount(blockDevice, directory, filesystemType,
                                        flags | MS_MGC_VAL, string_flags,
-                                       useMtab, fakeIt, mtab_opts);
+                                       useMtab, fakeIt, mtab_opts, mount_all);
                                if (status == TRUE)
                                        break;
                        }
@@ -262,7 +267,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
        } else {
                status = do_mount(blockDevice, directory, filesystemType,
                                flags | MS_MGC_VAL, string_flags, useMtab,
-                               fakeIt, mtab_opts);
+                               fakeIt, mtab_opts, mount_all);
        }
 
        if (status == FALSE) {
@@ -319,10 +324,14 @@ void show_mounts()
                while ((m = getmntent(mountTable)) != 0) {
                        char *blockDevice = m->mnt_fsname;
                        if (strcmp(blockDevice, "/dev/root") == 0) {
-                               find_real_root_device_name( blockDevice);
+                               blockDevice = find_real_root_device_name(blockDevice);
                        }
                        printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
                                   m->mnt_type, m->mnt_opts);
+#ifdef BB_FEATURE_CLEAN_UP
+                       if(blockDevice != m->mnt_fsname)
+                               free(blockDevice);
+#endif
                }
                endmntent(mountTable);
        } else {
@@ -334,12 +343,14 @@ void show_mounts()
 
 extern int mount_main(int argc, char **argv)
 {
+       struct stat statbuf;
        char string_flags_buf[1024] = "";
        char *string_flags = string_flags_buf;
        char *extra_opts = string_flags_buf;
        int flags = 0;
        char *filesystemType = "auto";
-       char device[PATH_MAX], directory[PATH_MAX];
+       char *device = xmalloc(PATH_MAX);
+       char *directory = xmalloc(PATH_MAX);
        int all = FALSE;
        int fakeIt = FALSE;
        int useMtab = TRUE;
@@ -382,19 +393,22 @@ extern int mount_main(int argc, char **argv)
                show_mounts();
 
        if (optind < argc) {
-               /* Don't canonicalize NFS devices.  */
-               if (strchr(argv[optind], ':') != NULL)
+               /* if device is a filename get its real path */
+               if (stat(argv[optind], &statbuf) == 0) {
+                       realpath(argv[optind], device);
+               } else {
                        safe_strncpy(device, argv[optind], PATH_MAX);
-               else if (realpath(argv[optind], device) == NULL)
-                       perror_msg_and_die("%s", device);
+               }
        }
 
-       if (optind + 1 < argc)
-               if (realpath(argv[optind + 1], directory) == NULL)
+       if (optind + 1 < argc) {
+               if (realpath(argv[optind + 1], directory) == NULL) {
                        perror_msg_and_die("%s", directory);
-
+               }
+       }
+       
        if (all == TRUE || optind + 1 == argc) {
-               struct mntent *m;
+               struct mntent *m = NULL;
                FILE *f = setmntent("/etc/fstab", "r");
                fstabmount = TRUE;
 
@@ -439,7 +453,7 @@ singlemount:
                        }
 #endif
                        if (!mount_one(device, directory, filesystemType, flags,
-                                       string_flags, useMtab, fakeIt, extra_opts, TRUE))
+                                       string_flags, useMtab, fakeIt, extra_opts, TRUE, all))
                                rc = EXIT_FAILURE;
                                
                        if (all == FALSE)