Don't whine about already mounted filesystems when invoked with -a.
[oweals/busybox.git] / util-linux / mount.c
index 551695b9b6f5bda444cef441cbd0cb808469559e..17517fe21f86efd580121aac8f88ab841e91e5ae 100644 (file)
@@ -43,6 +43,7 @@
  *     
  */
 
+#include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <mntent.h>
 #include <ctype.h>
+#include "busybox.h"
 #if defined BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+#      include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
 #endif
-#include "busybox.h"
 
 enum {
        MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
@@ -69,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 */
 };
 
 
@@ -84,6 +86,7 @@ extern int mount (__const char *__special_file, __const char *__dir,
 extern int umount (__const char *__special_file);
 extern int umount2 (__const char *__special_file, int __flags);
 
+extern int sysfs( int option, unsigned int fs_index, char * buf);
 
 extern const char mtab_file[]; /* Defined in utility.c */
 
@@ -110,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
@@ -145,17 +149,20 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
                }
 #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;
        }
 
 
        /* If the mount was sucessful, do anything needed, then return TRUE */
        if (status == 0 || fakeIt==TRUE) {
 
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
                if (useMtab == TRUE) {
                        erase_mtab(specialfile);        // Clean any stale entries
                        write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@@ -226,79 +233,41 @@ parse_mount_options(char *options, int *flags, char *strflags)
        }
 }
 
-int
+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;
 
-       char buf[255];
        if (strcmp(filesystemType, "auto") == 0) {
-               FILE *f = xfopen("/proc/filesystems", "r");
-
-               while (fgets(buf, sizeof(buf), f) != NULL) {
-                       filesystemType = buf;
-                       if (*filesystemType == '\t') {  // Not a nodev filesystem
-
-                               // Add NULL termination to each line
-                               while (*filesystemType && *filesystemType != '\n')
-                                       filesystemType++;
-                               *filesystemType = '\0';
-
-                               filesystemType = buf;
-                               filesystemType++;       // hop past tab
-
+               static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 };
+               const char **noauto_fstype;
+               const int num_of_filesystems = sysfs(3, 0, 0);
+               char buf[255];
+               int i=0;
+
+               filesystemType=buf;
+
+               while(i < num_of_filesystems) {
+                       sysfs(2, i++, filesystemType);
+                       for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) {
+                               if (!strcmp(filesystemType, *noauto_fstype)) {
+                                       break;
+                               }
+                       }
+                       if (!*noauto_fstype) {
                                status = do_mount(blockDevice, directory, filesystemType,
-                                                                 flags | MS_MGC_VAL, string_flags,
-                                                                 useMtab, fakeIt, mtab_opts);
+                                       flags | MS_MGC_VAL, string_flags,
+                                       useMtab, fakeIt, mtab_opts, mount_all);
                                if (status == TRUE)
                                        break;
                        }
                }
-               fclose(f);
-       } else
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-       if (strcmp(filesystemType, "auto") == 0) {
-               int fd, i, numfilesystems;
-               char device[] = "/dev/mtab";
-               struct k_fstype *fslist;
-
-               /* open device */ 
-               fd = open(device, O_RDONLY);
-               if (fd < 0)
-                       perror_msg_and_die("open failed for `%s'", device);
-
-               /* How many filesystems?  We need to know to allocate enough space */
-               numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS);
-               if (numfilesystems<0)
-                       perror_msg_and_die("\nDEVMTAB_COUNT_FILESYSTEMS");
-               fslist = (struct k_fstype *) xcalloc ( numfilesystems, sizeof(struct k_fstype));
-
-               /* Grab the list of available filesystems */
-               status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist);
-               if (status<0)
-                       perror_msg_and_die("\nDEVMTAB_GET_FILESYSTEMS");
-
-               /* Walk the list trying to mount filesystems 
-                * that do not claim to be nodev filesystems */
-               for( i = 0 ; i < numfilesystems ; i++) {
-                       if (fslist[i].mnt_nodev)
-                               continue;
-                       status = do_mount(blockDevice, directory, fslist[i].mnt_type,
-                                                         flags | MS_MGC_VAL, string_flags,
-                                                         useMtab, fakeIt, mtab_opts);
-                       if (status == TRUE)
-                               break;
-               }
-               free( fslist);
-               close(fd);
-       } else
-#endif
-       {
+       } else {
                status = do_mount(blockDevice, directory, filesystemType,
-                                                 flags | MS_MGC_VAL, string_flags, useMtab,
-                                                 fakeIt, mtab_opts);
+                               flags | MS_MGC_VAL, string_flags, useMtab,
+                               fakeIt, mtab_opts, mount_all);
        }
 
        if (status == FALSE) {
@@ -310,140 +279,136 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
        return (TRUE);
 }
 
+void show_mounts()
+{
+#if defined BB_FEATURE_USE_DEVPS_PATCH
+       int fd, i, numfilesystems;
+       char device[] = "/dev/mtab";
+       struct k_mntent *mntentlist;
+
+       /* open device */ 
+       fd = open(device, O_RDONLY);
+       if (fd < 0)
+               perror_msg_and_die("open failed for `%s'", device);
+
+       /* How many mounted filesystems?  We need to know to 
+        * allocate enough space for later... */
+       numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
+       if (numfilesystems<0)
+               perror_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS");
+       mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent));
+               
+       /* Grab the list of mounted filesystems */
+       if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
+               perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
+
+       for( i = 0 ; i < numfilesystems ; i++) {
+               printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
+                               mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
+                               mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
+                               mntentlist[i].mnt_passno);
+       }
+#ifdef BB_FEATURE_CLEAN_UP
+       /* Don't bother to close files or free memory.  Exit 
+        * does that automagically, so we can save a few bytes */
+       free( mntentlist);
+       close(fd);
+#endif
+       exit(EXIT_SUCCESS);
+#else
+       FILE *mountTable = setmntent(mtab_file, "r");
+
+       if (mountTable) {
+               struct mntent *m;
+
+               while ((m = getmntent(mountTable)) != 0) {
+                       char *blockDevice = m->mnt_fsname;
+                       if (strcmp(blockDevice, "/dev/root") == 0) {
+                               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 {
+               perror_msg_and_die("%s", mtab_file);
+       }
+       exit(EXIT_SUCCESS);
+#endif
+}
+
 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 = NULL;
-       char *directory = NULL;
+       char *device = xmalloc(PATH_MAX);
+       char *directory = xmalloc(PATH_MAX);
        int all = FALSE;
        int fakeIt = FALSE;
        int useMtab = TRUE;
-       int i;
        int rc = EXIT_FAILURE;
        int fstabmount = FALSE; 
+       int opt;
 
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-       if (argc == 1) {
-               int fd, i, numfilesystems;
-               char device[] = "/dev/mtab";
-               struct k_mntent *mntentlist;
-
-               /* open device */ 
-               fd = open(device, O_RDONLY);
-               if (fd < 0)
-                       perror_msg_and_die("open failed for `%s'", device);
-
-               /* How many mounted filesystems?  We need to know to 
-                * allocate enough space for later... */
-               numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
-               if (numfilesystems<0)
-                       perror_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS");
-               mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent));
-               
-               /* Grab the list of mounted filesystems */
-               if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
-                       perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
-
-               for( i = 0 ; i < numfilesystems ; i++) {
-                       printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
-                                       mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
-                                       mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
-                                       mntentlist[i].mnt_passno);
-               }
-#ifdef BB_FEATURE_CLEAN_UP
-               /* Don't bother to close files or free memory.  Exit 
-                * does that automagically, so we can save a few bytes */
-               free( mntentlist);
-               close(fd);
+       /* Parse options */
+       while ((opt = getopt(argc, argv, "o:rt:wafnv")) > 0) {
+               switch (opt) {
+               case 'o':
+                       parse_mount_options(optarg, &flags, string_flags);
+                       break;
+               case 'r':
+                       flags |= MS_RDONLY;
+                       break;
+               case 't':
+                       filesystemType = optarg;
+                       break;
+               case 'w':
+                       flags &= ~MS_RDONLY;
+                       break;
+               case 'a':
+                       all = TRUE;
+                       break;
+               case 'f':
+                       fakeIt = TRUE;
+                       break;
+#ifdef BB_FEATURE_MTAB_SUPPORT
+               case 'n':
+                       useMtab = FALSE;
+                       break;
 #endif
-               return EXIT_SUCCESS;
+               case 'v':
+                       break; /* ignore -v */
+               }
        }
-#else
-       if (argc == 1) {
-               FILE *mountTable = setmntent(mtab_file, "r");
 
-               if (mountTable) {
-                       struct mntent *m;
+       if (!all && optind == argc)
+               show_mounts();
 
-                       while ((m = getmntent(mountTable)) != 0) {
-                               char *blockDevice = m->mnt_fsname;
-                               if (strcmp(blockDevice, "/dev/root") == 0) {
-                                       find_real_root_device_name( blockDevice);
-                               }
-                               printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
-                                          m->mnt_type, m->mnt_opts);
-                       }
-                       endmntent(mountTable);
+       if (optind < argc) {
+               /* if device is a filename get its real path */
+               if (stat(argv[optind], &statbuf) == 0) {
+                       realpath(argv[optind], device);
                } else {
-                       perror_msg_and_die("%s", mtab_file);
+                       safe_strncpy(device, argv[optind], PATH_MAX);
                }
-               return EXIT_SUCCESS;
        }
-#endif
 
-       /* Parse options */
-       i = --argc;
-       argv++;
-       while (i > 0 && **argv) {
-               if (**argv == '-') {
-                       char *opt = *argv;
-
-                       while (i > 0 && *++opt)
-                               switch (*opt) {
-                               case 'o':
-                                       if (--i == 0) {
-                                               goto goodbye;
-                                       }
-                                       parse_mount_options(*(++argv), &flags, string_flags);
-                                       break;
-                               case 'r':
-                                       flags |= MS_RDONLY;
-                                       break;
-                               case 't':
-                                       if (--i == 0) {
-                                               goto goodbye;
-                                       }
-                                       filesystemType = *(++argv);
-                                       break;
-                               case 'w':
-                                       flags &= ~MS_RDONLY;
-                                       break;
-                               case 'a':
-                                       all = TRUE;
-                                       break;
-                               case 'f':
-                                       fakeIt = TRUE;
-                                       break;
-#ifdef BB_MTAB
-                               case 'n':
-                                       useMtab = FALSE;
-                                       break;
-#endif
-                               case 'v':
-                                       break; /* ignore -v */
-                               case 'h':
-                               case '-':
-                                       goto goodbye;
-                               }
-               } else {
-                       if (device == NULL)
-                               device = *argv;
-                       else if (directory == NULL)
-                               directory = *argv;
-                       else {
-                               goto goodbye;
-                       }
+       if (optind + 1 < argc) {
+               if (realpath(argv[optind + 1], directory) == NULL) {
+                       perror_msg_and_die("%s", directory);
                }
-               i--;
-               argv++;
        }
-
-       if (all == TRUE || directory == NULL) {
-               struct mntent *m;
+       
+       if (all == TRUE || optind + 1 == argc) {
+               struct mntent *m = NULL;
                FILE *f = setmntent("/etc/fstab", "r");
                fstabmount = TRUE;
 
@@ -451,7 +416,7 @@ extern int mount_main(int argc, char **argv)
                        perror_msg_and_die( "\nCannot read /etc/fstab");
 
                while ((m = getmntent(f)) != NULL) {
-                       if (all == FALSE && directory == NULL && (
+                       if (all == FALSE && optind + 1 == argc && (
                                (strcmp(device, m->mnt_fsname) != 0) &&
                                (strcmp(device, m->mnt_dir) != 0) ) ) {
                                continue;
@@ -470,25 +435,25 @@ extern int mount_main(int argc, char **argv)
                                parse_mount_options(m->mnt_opts, &flags, string_flags);
                        }
                        
-                       device = strdup(m->mnt_fsname);
-                       directory = strdup(m->mnt_dir);
+                       strcpy(device, m->mnt_fsname);
+                       strcpy(directory, m->mnt_dir);
                        filesystemType = strdup(m->mnt_type);
 singlemount:                   
+                       string_flags = strdup(string_flags);
                        rc = EXIT_SUCCESS;
 #ifdef BB_NFSMOUNT
                        if (strchr(device, ':') != NULL)
                                filesystemType = "nfs";
                        if (strcmp(filesystemType, "nfs") == 0) {
-                               rc = nfsmount (device, directory, &flags,
-                                       &extra_opts, &string_flags, 1);
-                               if ( rc != 0) {
-                                       perror_msg_and_die("nfsmount failed");  
+                               if (nfsmount (device, directory, &flags, &extra_opts,
+                                                       &string_flags, 1)) {
+                                       perror_msg("nfsmount failed");
                                        rc = EXIT_FAILURE;
                                }
                        }
 #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)
@@ -497,14 +462,11 @@ singlemount:
                if (fstabmount == TRUE)
                        endmntent(f);
                        
-               if (all == FALSE && fstabmount == TRUE && directory == NULL)
+               if (all == FALSE && fstabmount == TRUE && m == NULL)
                        fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
        
-               exit(rc);
+               return rc;
        }
        
        goto singlemount;
-       
-goodbye:
-       show_usage();
 }