* Mini mount implementation for busybox
*
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.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
*
*/
+#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <stdio.h>
#include <mntent.h>
#include <ctype.h>
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
-#endif
#include "busybox.h"
+#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
+# include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+#endif
enum {
MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
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 */
};
-#if defined BB_FEATURE_MOUNT_LOOP
+#if defined CONFIG_FEATURE_MOUNT_LOOP
#include <fcntl.h>
#include <sys/ioctl.h>
static int use_loop = FALSE;
{"async", ~MS_SYNCHRONOUS, 0},
{"atime", ~0, ~MS_NOATIME},
{"defaults", ~0, 0},
+ {"noauto", ~0, 0},
{"dev", ~MS_NODEV, 0},
{"diratime", ~0, ~MS_NODIRATIME},
{"exec", ~MS_NOEXEC, 0},
{"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
+#if defined CONFIG_FEATURE_MOUNT_LOOP
char *lofile = NULL;
#endif
- if (fakeIt == FALSE)
+ if (! fakeIt)
{
-#if defined BB_FEATURE_MOUNT_LOOP
+#if defined CONFIG_FEATURE_MOUNT_LOOP
if (use_loop==TRUE) {
int loro = flags & MS_RDONLY;
}
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;
}
/* If the mount was sucessful, do anything needed, then return TRUE */
if (status == 0 || fakeIt==TRUE) {
-#if defined BB_FEATURE_MTAB_SUPPORT
- if (useMtab == TRUE) {
+#if defined CONFIG_FEATURE_MTAB_SUPPORT
+ if (useMtab) {
erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
}
}
/* Bummer. mount failed. Clean up */
-#if defined BB_FEATURE_MOUNT_LOOP
+#if defined CONFIG_FEATURE_MOUNT_LOOP
if (lofile != NULL) {
del_loop(specialfile);
}
}
f++;
}
-#if defined BB_FEATURE_MOUNT_LOOP
- if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+ if (! gotone && !strcasecmp("loop", options)) { /* loop device support */
use_loop = TRUE;
gotone = TRUE;
}
#endif
- if (*strflags && strflags != '\0' && gotone == FALSE) {
+ if (*strflags && strflags != '\0' && ! gotone) {
char *temp = strflags;
temp += strlen(strflags);
*temp++ = ',';
*temp++ = '\0';
}
- if (gotone == FALSE)
+ if (! gotone)
strcat(strflags, options);
if (comma) {
*comma = ',';
}
}
-extern int
+static 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;
+#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
if (strcmp(filesystemType, "auto") == 0) {
- static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 };
+ static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs", 0 };
const char **noauto_fstype;
const int num_of_filesystems = sysfs(3, 0, 0);
char buf[255];
if (!*noauto_fstype) {
status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags,
- useMtab, fakeIt, mtab_opts);
- if (status == TRUE)
+ useMtab, fakeIt, mtab_opts, mount_all);
+ if (status)
break;
}
}
- } else {
+ }
+#else
+ if (strcmp(filesystemType, "auto") == 0) {
+ char buf[255];
+ 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
+
+ status = do_mount(blockDevice, directory, filesystemType,
+ flags | MS_MGC_VAL, string_flags,
+ useMtab, fakeIt, mtab_opts, mount_all);
+ if (status)
+ break;
+ }
+ }
+ fclose(f);
+ }
+#endif
+ 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) {
- if (whineOnErrors == TRUE) {
+ if (! status) {
+ if (whineOnErrors) {
perror_msg("Mounting %s on %s failed", blockDevice, directory);
}
return (FALSE);
return (TRUE);
}
+void show_mounts(void)
+{
+#if defined CONFIG_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 CONFIG_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 CONFIG_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 CONFIG_FEATURE_MTAB_SUPPORT
+ case 'n':
+ useMtab = FALSE;
+ break;
#endif
- return EXIT_SUCCESS;
- }
-#else
- if (argc == 1) {
- 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) {
- 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);
- } else {
- perror_msg_and_die("%s", mtab_file);
+ case 'v':
+ break; /* ignore -v */
}
- 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_FEATURE_MTAB_SUPPORT
- case 'n':
- useMtab = FALSE;
- break;
-#endif
- case 'v':
- break; /* ignore -v */
- case 'h':
- case '-':
- goto goodbye;
- }
+ if (!all && optind == argc)
+ show_mounts();
+
+ if (optind < argc) {
+ /* if device is a filename get its real path */
+ if (stat(argv[optind], &statbuf) == 0) {
+ char *tmp = simplify_path(argv[optind]);
+ safe_strncpy(device, tmp, PATH_MAX);
} else {
- if (device == NULL)
- device = *argv;
- else if (directory == NULL)
- directory = *argv;
- else {
- goto goodbye;
- }
+ safe_strncpy(device, argv[optind], PATH_MAX);
}
- i--;
- argv++;
}
- if (device == NULL && directory == NULL)
- goto goodbye;
+ if (optind + 1 < argc)
+ directory = simplify_path(argv[optind + 1]);
- if (all == TRUE || directory == NULL) {
- struct mntent *m;
+ if (all || optind + 1 == argc) {
+ struct mntent *m = NULL;
FILE *f = setmntent("/etc/fstab", "r");
fstabmount = TRUE;
perror_msg_and_die( "\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) {
- if (all == FALSE && directory == NULL && (
+ if (! all && optind + 1 == argc && (
(strcmp(device, m->mnt_fsname) != 0) &&
(strcmp(device, m->mnt_dir) != 0) ) ) {
continue;
}
- if (all == TRUE && ( // If we're mounting 'all'
+ if (all && ( // If we're mounting 'all'
(strstr(m->mnt_opts, "noauto")) || // and the file system isn't noauto,
(strstr(m->mnt_type, "swap")) || // and isn't swap or nfs, then mount it
(strstr(m->mnt_type, "nfs")) ) ) {
continue;
}
- if (all == TRUE || flags == 0) { // Allow single mount to override fstab flags
+ if (all || flags == 0) { // Allow single mount to override fstab flags
flags = 0;
+ string_flags = string_flags_buf;
*string_flags = '\0';
parse_mount_options(m->mnt_opts, &flags, string_flags);
}
- device = strdup(m->mnt_fsname);
- directory = strdup(m->mnt_dir);
- filesystemType = strdup(m->mnt_type);
+ strcpy(device, m->mnt_fsname);
+ strcpy(directory, m->mnt_dir);
+ filesystemType = xstrdup(m->mnt_type);
singlemount:
- string_flags = strdup(string_flags);
+ string_flags = xstrdup(string_flags);
rc = EXIT_SUCCESS;
-#ifdef BB_NFSMOUNT
- if (strchr(device, ':') != NULL)
+#ifdef CONFIG_NFSMOUNT
+ if (strchr(device, ':') != NULL) {
filesystemType = "nfs";
- if (strcmp(filesystemType, "nfs") == 0) {
if (nfsmount (device, directory, &flags, &extra_opts,
&string_flags, 1)) {
perror_msg("nfsmount failed");
}
#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)
+ if (! all)
break;
}
- if (fstabmount == TRUE)
+ if (fstabmount)
endmntent(f);
- if (all == FALSE && fstabmount == TRUE && directory == NULL)
+ if (! all && fstabmount && m == NULL)
fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
return rc;
}
goto singlemount;
-
-goodbye:
- show_usage();
}
projects / oweals / busybox.git / blobdiff