* 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>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@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
*
* 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
*
- * 1999-10-07 Erik Andersen <andersee@debian.org>.
+ * 1999-10-07 Erik Andersen <andersen@codepoet.org>.
* Rewrite of a lot of code. Removed mtab usage (I plan on
- * putting it back as a compile-time option some time),
- * major adjustments to option parsing, and some serious
+ * putting it back as a compile-time option some time),
+ * major adjustments to option parsing, and some serious
* dieting all around.
*
- * 1999-11-06 mtab suppport is back - andersee
+ * 1999-11-06 mtab support is back - andersee
*
* 2000-01-12 Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
* mount to add loop support.
* Rewrote fstab while loop and lower mount section. Can now do
* single mounts from fstab. Can override fstab options for single
* mount. Common mount_one call for single mounts and 'all'. Fixed
- * mtab updating and stale entries. Removed 'remount' default.
- *
+ * mtab updating and stale entries. Removed 'remount' default.
+ *
*/
#include <limits.h>
#include <ctype.h>
#include "busybox.h"
+#ifdef CONFIG_NFSMOUNT
+#if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile."
+#endif
+#endif
+
enum {
MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
MS_RDONLY = 1, /* Mount read-only */
extern int sysfs(int option, unsigned int fs_index, char *buf);
-extern const char mtab_file[]; /* Defined in utility.c */
-
struct mount_options {
const char *name;
unsigned long and;
specialfile = find_unused_loop_device();
if (specialfile == NULL) {
- error_msg_and_die("Could not find a spare loop device");
+ bb_error_msg_and_die("Could not find a spare loop device");
}
if (set_loop(specialfile, lofile, 0, &loro)) {
- error_msg_and_die("Could not setup loop device");
+ bb_error_msg_and_die("Could not setup loop device");
}
if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */
- error_msg("WARNING: loop device is read-only");
+ bb_error_msg("WARNING: loop device is read-only");
flags |= MS_RDONLY;
}
}
#endif
status = mount(specialfile, dir, filesystemtype, flags, string_flags);
if (status < 0 && errno == EROFS) {
- error_msg("%s is write-protected, mounting read-only",
+ bb_error_msg("%s is write-protected, mounting read-only",
specialfile);
status = mount(specialfile, dir, filesystemtype, flags |=
MS_RDONLY, string_flags);
#endif
if (errno == EPERM) {
- error_msg_and_die("permission denied. Are you root?");
+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
}
return (FALSE);
filesystemType = buf;
- if (xstrlen(filesystemType)) {
- status =
- do_mount(blockDevice, directory, filesystemType,
+ if (bb_strlen(filesystemType)) {
+ status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags,
useMtab, fakeIt, mtab_opts, mount_all);
if (status) {
}
}
fclose(f);
+ } else {
+ read_proc = 1;
}
- if ((!f || read_proc) && !status) {
- f = xfopen("/proc/filesystems", "r");
+ if (read_proc && !status) {
+
+ f = bb_xfopen("/proc/filesystems", "r");
while (fgets(buf, sizeof(buf), f) != NULL) {
filesystemType = buf;
filesystemType = buf;
filesystemType++; /* hop past tab */
- status =
- do_mount(blockDevice, directory, filesystemType,
+ status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags, useMtab,
fakeIt, mtab_opts, mount_all);
if (status) {
}
}
}
+ fclose(f);
}
- fclose(f);
} else {
- status =
- do_mount(blockDevice, directory, filesystemType,
+ status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
mtab_opts, mount_all);
}
if (!status) {
if (whineOnErrors) {
- perror_msg("Mounting %s on %s failed", blockDevice, directory);
+ bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
}
return (FALSE);
}
static void show_mounts(char *onlytype)
{
- FILE *mountTable = setmntent(mtab_file, "r");
+ FILE *mountTable = setmntent(bb_path_mtab_file, "r");
if (mountTable) {
struct mntent *m;
while ((m = getmntent(mountTable)) != 0) {
char *blockDevice = m->mnt_fsname;
- if (strcmp(blockDevice, "/dev/root") == 0) {
+ if (strcmp(blockDevice, "rootfs") == 0) {
+ continue;
+ } else if (strcmp(blockDevice, "/dev/root") == 0) {
blockDevice = find_real_root_device_name(blockDevice);
}
if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
}
endmntent(mountTable);
} else {
- perror_msg_and_die("%s", mtab_file);
+ bb_perror_msg_and_die(bb_path_mtab_file);
}
exit(EXIT_SUCCESS);
}
extern int mount_main(int argc, char **argv)
{
struct stat statbuf;
- char *string_flags = xstrdup("");
+ char *string_flags = bb_xstrdup("");
char *extra_opts;
int flags = 0;
char *filesystemType = "auto";
case 'f':
fakeIt = TRUE;
break;
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
useMtab = FALSE;
- break;
#endif
+ break;
case 'v':
break; /* ignore -v */
}
if (optind < argc) {
/* if device is a filename get its real path */
if (stat(argv[optind], &statbuf) == 0) {
- char *tmp = simplify_path(argv[optind]);
+ char *tmp = bb_simplify_path(argv[optind]);
safe_strncpy(device, tmp, PATH_MAX);
} else {
}
if (optind + 1 < argc)
- directory = simplify_path(argv[optind + 1]);
+ directory = bb_simplify_path(argv[optind + 1]);
if (all || optind + 1 == argc) {
f = setmntent("/etc/fstab", "r");
if (f == NULL)
- perror_msg_and_die("\nCannot read /etc/fstab");
+ bb_perror_msg_and_die("\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) {
if (!all && (optind + 1 == argc)
strcpy(device, m->mnt_fsname);
strcpy(directory, m->mnt_dir);
- filesystemType = xstrdup(m->mnt_type);
+ filesystemType = bb_xstrdup(m->mnt_type);
singlemount:
extra_opts = string_flags;
rc = EXIT_SUCCESS;
if (nfsmount
(device, directory, &flags, &extra_opts, &string_flags,
1)) {
- perror_msg("nfsmount failed");
+ bb_perror_msg("nfsmount failed");
rc = EXIT_FAILURE;
}
}
projects / oweals / busybox.git / blobdiff