* bb_getopt_ulflags();
*/
-/* Design notes: There is no spec for this. Remind me to write one.
+/* Design notes: There is no spec for mount. Remind me to write one.
mount_main() calls singlemount() which calls mount_it_now().
mount_it_now() does the actual mount.
*/
-#include <limits.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <mntent.h>
-#include <ctype.h>
-#include <sys/mount.h>
-#include <fcntl.h> // for CONFIG_FEATURE_MOUNT_LOOP
-#include <sys/ioctl.h> // for CONFIG_FEATURE_MOUNT_LOOP
#include "busybox.h"
+#include <mntent.h>
// These two aren't always defined in old headers
#ifndef MS_BIND
static void append_mount_options(char **oldopts, char *newopts)
{
if(*oldopts && **oldopts) {
- char *temp=bb_xasprintf("%s,%s",*oldopts,newopts);
+ char *temp=xasprintf("%s,%s",*oldopts,newopts);
free(*oldopts);
*oldopts=temp;
} else {
if (ENABLE_FEATURE_CLEAN_UP) free(*oldopts);
- *oldopts = bb_xstrdup(newopts);
+ *oldopts = xstrdup(newopts);
}
}
if(*fs=='#' || *fs=='*') continue;
if(!*fs) continue;
- list=llist_add_to_end(list,bb_xstrdup(fs));
+ llist_add_to_end(&list,xstrdup(fs));
}
if (ENABLE_FEATURE_CLEAN_UP) fclose(f);
}
#if ENABLE_FEATURE_CLEAN_UP
static void delete_block_backed_filesystems(void)
{
- llist_free(fslist);
+ llist_free(fslist, free);
}
#else
void delete_block_backed_filesystems(void);
// Mount one directory. Handles NFS, loopback, autobind, and filesystem type
// detection. Returns 0 for success, nonzero for failure.
-static int singlemount(struct mntent *mp)
+static int singlemount(struct mntent *mp, int ignore_busy)
{
- int rc = 1, vfsflags;
+ int rc = -1, vfsflags;
char *loopFile = 0, *filteropts = 0;
llist_t *fl = 0;
struct stat st;
{
if (nfsmount(mp->mnt_fsname, mp->mnt_dir, &vfsflags, &filteropts, 1)) {
bb_perror_msg("nfsmount failed");
- return 1;
+ goto report_error;
} else {
// Strangely enough, nfsmount() doesn't actually mount() anything.
+ mp->mnt_type = "nfs";
rc = mount_it_now(mp, vfsflags, filteropts);
if (ENABLE_FEATURE_CLEAN_UP) free(filteropts);
- return rc;
+ goto report_error;
}
}
- // Look at the file. (Not found isn't a failure for remount.)
+ // Look at the file. (Not found isn't a failure for remount, or for
+ // a synthetic filesystem like proc or sysfs.)
if (lstat(mp->mnt_fsname, &st));
-
- if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
+ else if (!(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
// Do we need to allocate a loopback device for it?
if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
// If mount failed, clean up loop file (if any).
- if (rc && loopFile) {
+ if (ENABLE_FEATURE_MOUNT_LOOP && rc && loopFile) {
del_loop(mp->mnt_fsname);
if (ENABLE_FEATURE_CLEAN_UP) {
free(loopFile);
free(mp->mnt_fsname);
}
}
+report_error:
+ if (rc && errno == EBUSY && ignore_busy) rc = 0;
+ if (rc < 0)
+ bb_perror_msg("Mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
+
return rc;
}
-
// Parse options, if necessary parse fstab/mtab, and call singlemount for
// each directory to be mounted.
int mount_main(int argc, char **argv)
{
- char *cmdopts = bb_xstrdup(""), *fstabname, *fstype=0, *storage_path=0;
+ char *cmdopts = xstrdup(""), *fstabname, *fstype=0, *storage_path=0;
FILE *fstab;
- int i, opt, all = FALSE, rc = 1;
+ int i, opt, all = FALSE, rc = 0;
struct mntent mtpair[2], *mtcur = mtpair;
/* parse long options, like --bind and --move. Note that -o option
mtpair->mnt_dir = argv[optind+1];
mtpair->mnt_type = fstype;
mtpair->mnt_opts = cmdopts;
- rc = singlemount(mtpair);
+ rc = singlemount(mtpair, 0);
goto clean_up;
}
// Get next fstab entry
- if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1,
- sizeof(bb_common_bufsiz1)))
+ if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1
+ + (mtcur==mtpair ? sizeof(bb_common_bufsiz1)/2 : 0),
+ sizeof(bb_common_bufsiz1)/2))
{
// Were we looking for something specific?
// Mount the last thing we found.
mtcur = mtnext;
- mtcur->mnt_opts=bb_xstrdup(mtcur->mnt_opts);
+ mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
append_mount_options(&(mtcur->mnt_opts),cmdopts);
- rc = singlemount(mtcur);
+ rc = singlemount(mtcur, 0);
free(mtcur->mnt_opts);
}
- break;
+ goto clean_up;
}
/* If we're trying to mount something specific and this isn't it,
// Mount this thing.
- rc = singlemount(mtcur);
- if (rc) {
- // Don't whine about already mounted fs when mounting all.
- if (errno == EBUSY) rc = 0;
- else break;
+ if (singlemount(mtcur, 1)) {
+ /* Count number of failed mounts */
+ rc++;
}
}
}
free(cmdopts);
}
- if(rc)
- bb_perror_msg("Mounting %s on %s failed",
- mtcur->mnt_fsname, mtcur->mnt_dir);
-
return rc;
}