mount_it_now() does the actual mount.
*/
-#include "libbb.h"
#include <mntent.h>
-
-/* Needed for nfs support only... */
#include <syslog.h>
+#include "libbb.h"
+
+#if ENABLE_FEATURE_MOUNT_LABEL
+#include "volume_id.h"
+#endif
+
+/* Needed for nfs support only */
#include <sys/utsname.h>
#undef TRUE
#undef FALSE
#include <rpc/pmap_prot.h>
#include <rpc/pmap_clnt.h>
+#ifndef MS_SILENT
+#define MS_SILENT (1 << 15)
+#endif
+/* Grab more as needed from util-linux's mount/mount_constants.h */
+#ifndef MS_DIRSYNC
+#define MS_DIRSYNC 128 /* Directory modifications are synchronous */
+#endif
+
#if defined(__dietlibc__)
/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
* dietlibc-0.30 does not have implementation of getmntent_r() */
-/* OTOH: why we use getmntent_r instead of getmntent? TODO... */
-struct mntent *getmntent_r(FILE* stream, struct mntent* result, char* buffer, int bufsize)
+static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
+ char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
{
- /* *** XXX FIXME WARNING: This hack is NOT thread safe. --Sampo */
struct mntent* ment = getmntent(stream);
- memcpy(result, ment, sizeof(struct mntent));
- return result;
+ return memcpy(result, ment, sizeof(*ment));
}
#endif
// Not real flags, but we want to be able to check for this.
enum {
- MOUNT_USERS = (1<<28)*ENABLE_DESKTOP,
- MOUNT_NOAUTO = (1<<29),
- MOUNT_SWAP = (1<<30),
+ MOUNT_USERS = (1 << 28) * ENABLE_DESKTOP,
+ MOUNT_NOAUTO = (1 << 29),
+ MOUNT_SWAP = (1 << 30),
+};
+
+
+#define OPTION_STR "o:t:rwanfvsi"
+enum {
+ OPT_o = (1 << 0),
+ OPT_t = (1 << 1),
+ OPT_r = (1 << 2),
+ OPT_w = (1 << 3),
+ OPT_a = (1 << 4),
+ OPT_n = (1 << 5),
+ OPT_f = (1 << 6),
+ OPT_v = (1 << 7),
+ OPT_s = (1 << 8),
+ OPT_i = (1 << 9),
};
+
+#if ENABLE_FEATURE_MTAB_SUPPORT
+#define useMtab (!(option_mask32 & OPT_n))
+#else
+#define useMtab 0
+#endif
+
+#if ENABLE_FEATURE_MOUNT_FAKE
+#define fakeIt (option_mask32 & OPT_f)
+#else
+#define fakeIt 0
+#endif
+
+
// TODO: more "user" flag compatibility.
// "user" option (from mount manpage):
// Only the user that mounted a filesystem can unmount it again.
/* Standard mount options (from -o options or --options), with corresponding
* flags */
-struct {
- const char *name;
- long flags;
-} static mount_options[] = {
+static const int32_t mount_options[] = {
// MS_FLAGS set a bit. ~MS_FLAGS disable that bit. 0 flags are NOPs.
USE_FEATURE_MOUNT_LOOP(
- {"loop", 0},
+ /* "loop" */ 0,
)
USE_FEATURE_MOUNT_FSTAB(
- {"defaults", 0},
- /* {"quiet", 0}, - do not filter out, vfat wants to see it */
- {"noauto", MOUNT_NOAUTO},
- {"sw", MOUNT_SWAP},
- {"swap", MOUNT_SWAP},
- USE_DESKTOP({"user", MOUNT_USERS},)
- USE_DESKTOP({"users", MOUNT_USERS},)
+ /* "defaults" */ 0,
+ /* "quiet" 0 - do not filter out, vfat wants to see it */
+ /* "noauto" */ MOUNT_NOAUTO,
+ /* "sw" */ MOUNT_SWAP,
+ /* "swap" */ MOUNT_SWAP,
+ USE_DESKTOP(/* "user" */ MOUNT_USERS,)
+ USE_DESKTOP(/* "users" */ MOUNT_USERS,)
+ /* "_netdev" */ 0,
)
USE_FEATURE_MOUNT_FLAGS(
// vfs flags
- {"nosuid", MS_NOSUID},
- {"suid", ~MS_NOSUID},
- {"dev", ~MS_NODEV},
- {"nodev", MS_NODEV},
- {"exec", ~MS_NOEXEC},
- {"noexec", MS_NOEXEC},
- {"sync", MS_SYNCHRONOUS},
- {"async", ~MS_SYNCHRONOUS},
- {"atime", ~MS_NOATIME},
- {"noatime", MS_NOATIME},
- {"diratime", ~MS_NODIRATIME},
- {"nodiratime", MS_NODIRATIME},
- {"loud", ~MS_SILENT},
+ /* "nosuid" */ MS_NOSUID,
+ /* "suid" */ ~MS_NOSUID,
+ /* "dev" */ ~MS_NODEV,
+ /* "nodev" */ MS_NODEV,
+ /* "exec" */ ~MS_NOEXEC,
+ /* "noexec" */ MS_NOEXEC,
+ /* "sync" */ MS_SYNCHRONOUS,
+ /* "dirsync" */ MS_DIRSYNC,
+ /* "async" */ ~MS_SYNCHRONOUS,
+ /* "atime" */ ~MS_NOATIME,
+ /* "noatime" */ MS_NOATIME,
+ /* "diratime" */ ~MS_NODIRATIME,
+ /* "nodiratime" */ MS_NODIRATIME,
+ /* "mand" */ MS_MANDLOCK,
+ /* "nomand" */ ~MS_MANDLOCK,
+ /* "loud" */ ~MS_SILENT,
// action flags
+ /* "bind" */ MS_BIND,
+ /* "move" */ MS_MOVE,
+ /* "shared" */ MS_SHARED,
+ /* "slave" */ MS_SLAVE,
+ /* "private" */ MS_PRIVATE,
+ /* "unbindable" */ MS_UNBINDABLE,
+ /* "rshared" */ MS_SHARED|MS_RECURSIVE,
+ /* "rslave" */ MS_SLAVE|MS_RECURSIVE,
+ /* "rprivate" */ MS_SLAVE|MS_RECURSIVE,
+ /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
+ )
- {"bind", MS_BIND},
- {"move", MS_MOVE},
- {"shared", MS_SHARED},
- {"slave", MS_SLAVE},
- {"private", MS_PRIVATE},
- {"unbindable", MS_UNBINDABLE},
- {"rshared", MS_SHARED|MS_RECURSIVE},
- {"rslave", MS_SLAVE|MS_RECURSIVE},
- {"rprivate", MS_SLAVE|MS_RECURSIVE},
- {"runbindable", MS_UNBINDABLE|MS_RECURSIVE},
+ // Always understood.
+ /* "ro" */ MS_RDONLY, // vfs flag
+ /* "rw" */ ~MS_RDONLY, // vfs flag
+ /* "remount" */ MS_REMOUNT // action flag
+};
+
+static const char mount_option_str[] =
+ USE_FEATURE_MOUNT_LOOP(
+ "loop" "\0"
+ )
+ USE_FEATURE_MOUNT_FSTAB(
+ "defaults" "\0"
+ /* "quiet" "\0" - do not filter out, vfat wants to see it */
+ "noauto" "\0"
+ "sw" "\0"
+ "swap" "\0"
+ USE_DESKTOP("user" "\0")
+ USE_DESKTOP("users" "\0")
+ "_netdev" "\0"
+ )
+ USE_FEATURE_MOUNT_FLAGS(
+ // vfs flags
+ "nosuid" "\0"
+ "suid" "\0"
+ "dev" "\0"
+ "nodev" "\0"
+ "exec" "\0"
+ "noexec" "\0"
+ "sync" "\0"
+ "dirsync" "\0"
+ "async" "\0"
+ "atime" "\0"
+ "noatime" "\0"
+ "diratime" "\0"
+ "nodiratime" "\0"
+ "mand" "\0"
+ "nomand" "\0"
+ "loud" "\0"
+
+ // action flags
+ "bind" "\0"
+ "move" "\0"
+ "shared" "\0"
+ "slave" "\0"
+ "private" "\0"
+ "unbindable" "\0"
+ "rshared" "\0"
+ "rslave" "\0"
+ "rprivate" "\0"
+ "runbindable" "\0"
)
// Always understood.
+ "ro" "\0" // vfs flag
+ "rw" "\0" // vfs flag
+ "remount" "\0" // action flag
+;
+
+
+struct globals {
+#if ENABLE_FEATURE_MOUNT_NFS
+ smalluint nfs_mount_version;
+#endif
+#if ENABLE_FEATURE_MOUNT_VERBOSE
+ unsigned verbose;
+#endif
+ llist_t *fslist;
+ char getmntent_buf[1];
- {"ro", MS_RDONLY}, // vfs flag
- {"rw", ~MS_RDONLY}, // vfs flag
- {"remount", MS_REMOUNT}, // action flag
};
+enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define nfs_mount_version (G.nfs_mount_version)
+#if ENABLE_FEATURE_MOUNT_VERBOSE
+#define verbose (G.verbose )
+#else
+#define verbose 0
+#endif
+#define fslist (G.fslist )
+#define getmntent_buf (G.getmntent_buf )
+
+
+#if ENABLE_FEATURE_MOUNT_VERBOSE
+static int verbose_mount(const char *source, const char *target,
+ const char *filesystemtype,
+ unsigned long mountflags, const void *data)
+{
+ int rc;
+
+ errno = 0;
+ rc = mount(source, target, filesystemtype, mountflags, data);
+ if (verbose >= 2)
+ bb_perror_msg("mount('%s','%s','%s',0x%08lx,'%s'):%d",
+ source, target, filesystemtype,
+ mountflags, (char*)data, rc);
+ return rc;
+}
+#else
+#define verbose_mount(...) mount(__VA_ARGS__)
+#endif
+
+static int resolve_mount_spec(char **fsname)
+{
+ char *tmp = NULL;
+#if ENABLE_FEATURE_MOUNT_LABEL
+ if (!strncmp(*fsname, "UUID=", 5))
+ tmp = get_devname_from_uuid(*fsname + 5);
+ else if (!strncmp(*fsname, "LABEL=", 6))
+ tmp = get_devname_from_label(*fsname + 6);
+#endif
+
+ if (tmp) {
+ *fsname = tmp;
+ return 1;
+ }
+ return 0;
+}
/* Append mount options to string */
static void append_mount_options(char **oldopts, const char *newopts)
p = *oldopts;
while (1) {
if (!strncmp(p, newopts, len)
- && (p[len]==',' || p[len]==0))
+ && (p[len] == ',' || p[len] == '\0'))
goto skip;
p = strchr(p,',');
if (!p) break;
p = xasprintf("%s,%.*s", *oldopts, len, newopts);
free(*oldopts);
*oldopts = p;
-skip:
+ skip:
newopts += len;
while (newopts[0] == ',') newopts++;
}
/* Use the mount_options list to parse options into flags.
* Also return list of unrecognized options if unrecognized!=NULL */
-static int parse_mount_options(char *options, char **unrecognized)
+static long parse_mount_options(char *options, char **unrecognized)
{
- int flags = MS_SILENT;
+ long flags = MS_SILENT;
// Loop through options
for (;;) {
- int i;
+ unsigned i;
char *comma = strchr(options, ',');
+ const char *option_str = mount_option_str;
- if (comma) *comma = 0;
+ if (comma) *comma = '\0';
+/* FIXME: use hasmntopt() */
// Find this option in mount_options
for (i = 0; i < ARRAY_SIZE(mount_options); i++) {
- if (!strcasecmp(mount_options[i].name, options)) {
- long fl = mount_options[i].flags;
+ if (!strcasecmp(option_str, options)) {
+ long fl = mount_options[i];
if (fl < 0) flags &= fl;
else flags |= fl;
break;
}
+ option_str += strlen(option_str) + 1;
}
// If unrecognized not NULL, append unrecognized mount options */
if (unrecognized && i == ARRAY_SIZE(mount_options)) {
// Add it to strflags, to pass on to kernel
i = *unrecognized ? strlen(*unrecognized) : 0;
- *unrecognized = xrealloc(*unrecognized, i+strlen(options)+2);
+ *unrecognized = xrealloc(*unrecognized, i + strlen(options) + 2);
// Comma separated if it's not the first one
if (i) (*unrecognized)[i++] = ',';
strcpy((*unrecognized)+i, options);
}
- // Advance to next option, or finish
- if (comma) {
- *comma = ',';
- options = ++comma;
- } else break;
+ if (!comma)
+ break;
+ // Advance to next option
+ *comma = ',';
+ options = ++comma;
}
return flags;
FILE *f;
for (i = 0; i < 2; i++) {
- f = fopen(filesystems[i], "r");
+ f = fopen_for_read(filesystems[i]);
if (!f) continue;
- while ((buf = xmalloc_getline(f)) != 0) {
+ while ((buf = xmalloc_fgetline(f)) != NULL) {
if (!strncmp(buf, "nodev", 5) && isspace(buf[5]))
continue;
fs = skip_whitespace(buf);
return list;
}
-llist_t *fslist = 0;
-
#if ENABLE_FEATURE_CLEAN_UP
static void delete_block_backed_filesystems(void)
{
void delete_block_backed_filesystems(void);
#endif
-#if ENABLE_FEATURE_MTAB_SUPPORT
-static int useMtab = 1;
-static int fakeIt;
-#else
-#define useMtab 0
-#define fakeIt 0
-#endif
-
// Perform actual mount of specific filesystem at specific location.
// NB: mp->xxx fields may be trashed on exit
-static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
+static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts)
{
int rc = 0;
- if (fakeIt) goto mtab;
+ if (fakeIt) {
+ if (verbose >= 2)
+ bb_error_msg("would do mount('%s','%s','%s',0x%08lx,'%s')",
+ mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
+ vfsflags, filteropts);
+ goto mtab;
+ }
// Mount, with fallback to read-only if necessary.
-
for (;;) {
- rc = mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
+ errno = 0;
+ rc = verbose_mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
vfsflags, filteropts);
- if (!rc || (vfsflags&MS_RDONLY) || (errno!=EACCES && errno!=EROFS))
+
+ // If mount failed, try
+ // helper program mount.<mnt_type>
+ if (ENABLE_FEATURE_MOUNT_HELPERS && rc) {
+ char *args[6];
+ int errno_save = errno;
+ args[0] = xasprintf("mount.%s", mp->mnt_type);
+ rc = 1;
+ if (filteropts) {
+ args[rc++] = (char *)"-o";
+ args[rc++] = filteropts;
+ }
+ args[rc++] = mp->mnt_fsname;
+ args[rc++] = mp->mnt_dir;
+ args[rc] = NULL;
+ rc = wait4pid(spawn(args));
+ free(args[0]);
+ if (!rc)
+ break;
+ errno = errno_save;
+ }
+
+ if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
break;
- bb_error_msg("%s is write-protected, mounting read-only",
- mp->mnt_fsname);
+ if (!(vfsflags & MS_SILENT))
+ bb_error_msg("%s is write-protected, mounting read-only",
+ mp->mnt_fsname);
vfsflags |= MS_RDONLY;
}
/* If the mount was successful, and we're maintaining an old-style
* mtab file by hand, add the new entry to it now. */
mtab:
- if (ENABLE_FEATURE_MTAB_SUPPORT && useMtab && !rc && !(vfsflags & MS_REMOUNT)) {
+ if (useMtab && !rc && !(vfsflags & MS_REMOUNT)) {
char *fsname;
FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
+ const char *option_str = mount_option_str;
int i;
if (!mountTable) {
- bb_error_msg("no %s",bb_path_mtab_file);
+ bb_error_msg("no %s", bb_path_mtab_file);
goto ret;
}
// Add vfs string flags
- for (i=0; mount_options[i].flags != MS_REMOUNT; i++)
- if (mount_options[i].flags > 0 && (mount_options[i].flags & vfsflags))
- append_mount_options(&(mp->mnt_opts), mount_options[i].name);
+ for (i = 0; mount_options[i] != MS_REMOUNT; i++) {
+ if (mount_options[i] > 0 && (mount_options[i] & vfsflags))
+ append_mount_options(&(mp->mnt_opts), option_str);
+ option_str += strlen(option_str) + 1;
+ }
// Remove trailing / (if any) from directory we mounted on
i = strlen(mp->mnt_dir) - 1;
- if (i > 0 && mp->mnt_dir[i] == '/') mp->mnt_dir[i] = 0;
+ if (i > 0 && mp->mnt_dir[i] == '/') mp->mnt_dir[i] = '\0';
// Convert to canonical pathnames as needed
* Wed Oct 1 23:55:28 1997: Dick Streefland <dick_streefland@tasking.com>
* Implemented the "bg", "fg" and "retry" mount options for NFS.
*
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * 1999-02-22 Arkadiusz Mickiewicz <misiek@misiek.eu.org>
* - added Native Language Support
*
* Modified by Olaf Kirch and Trond Myklebust for new NFS code,
NFS_MOUNT_TCP = 0x0040, /* 2 */
NFS_MOUNT_VER3 = 0x0080, /* 3 */
NFS_MOUNT_KERBEROS = 0x0100, /* 3 */
- NFS_MOUNT_NONLM = 0x0200 /* 3 */
+ NFS_MOUNT_NONLM = 0x0200, /* 3 */
+ NFS_MOUNT_NORDIRPLUS = 0x4000
};
// Convert each NFSERR_BLAH into EBLAH
static const struct {
- int stat;
- int errnum;
+ short stat;
+ short errnum;
} nfs_errtbl[] = {
{0,0}, {1,EPERM}, {2,ENOENT}, {5,EIO}, {6,ENXIO}, {13,EACCES}, {17,EEXIST},
{19,ENODEV}, {20,ENOTDIR}, {21,EISDIR}, {22,EINVAL}, {27,EFBIG},
static char *nfs_strerror(int status)
{
int i;
- static char buf[sizeof("unknown nfs status return value: ") + sizeof(int)*3];
for (i = 0; nfs_errtbl[i].stat != -1; i++) {
if (nfs_errtbl[i].stat == status)
return strerror(nfs_errtbl[i].errnum);
}
- sprintf(buf, "unknown nfs status return value: %d", status);
- return buf;
+ return xasprintf("unknown nfs status return value: %d", status);
}
static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
/*
- * nfs_mount_version according to the sources seen at compile time.
- */
-static int nfs_mount_version;
-static int kernel_version;
-
-/*
* Unfortunately, the kernel prints annoying console messages
* in case of an unexpected nfs mount version (instead of
* just returning some error). Therefore we'll have to try
static void
find_kernel_nfs_mount_version(void)
{
- if (kernel_version)
+ int kernel_version;
+
+ if (nfs_mount_version)
return;
nfs_mount_version = 4; /* default */
}
}
-static struct pmap *
-get_mountport(struct sockaddr_in *server_addr,
+static void
+get_mountport(struct pmap *pm_mnt,
+ struct sockaddr_in *server_addr,
long unsigned prog,
long unsigned version,
long unsigned proto,
long unsigned port)
{
struct pmaplist *pmap;
- static struct pmap p = {0, 0, 0, 0};
server_addr->sin_port = PMAPPORT;
/* glibc 2.4 (still) has pmap_getmaps(struct sockaddr_in *).
version = MAX_NFSPROT;
if (!prog)
prog = MOUNTPROG;
- p.pm_prog = prog;
- p.pm_vers = version;
- p.pm_prot = proto;
- p.pm_port = port;
+ pm_mnt->pm_prog = prog;
+ pm_mnt->pm_vers = version;
+ pm_mnt->pm_prot = proto;
+ pm_mnt->pm_port = port;
while (pmap) {
if (pmap->pml_map.pm_prog != prog)
goto next;
- if (!version && p.pm_vers > pmap->pml_map.pm_vers)
+ if (!version && pm_mnt->pm_vers > pmap->pml_map.pm_vers)
goto next;
if (version > 2 && pmap->pml_map.pm_vers != version)
goto next;
if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
goto next;
if (pmap->pml_map.pm_vers > MAX_NFSPROT ||
- (proto && p.pm_prot && pmap->pml_map.pm_prot != proto) ||
+ (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto) ||
(port && pmap->pml_map.pm_port != port))
goto next;
- memcpy(&p, &pmap->pml_map, sizeof(p));
-next:
+ memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt));
+ next:
pmap = pmap->pml_next;
}
- if (!p.pm_vers)
- p.pm_vers = MOUNTVERS;
- if (!p.pm_port)
- p.pm_port = MOUNTPORT;
- if (!p.pm_prot)
- p.pm_prot = IPPROTO_TCP;
- return &p;
+ if (!pm_mnt->pm_vers)
+ pm_mnt->pm_vers = MOUNTVERS;
+ if (!pm_mnt->pm_port)
+ pm_mnt->pm_port = MOUNTPORT;
+ if (!pm_mnt->pm_prot)
+ pm_mnt->pm_prot = IPPROTO_TCP;
}
#if BB_MMU
static int daemonize(void)
{
- int fd;
int pid = fork();
if (pid < 0) /* error */
return -errno;
if (pid > 0) /* parent */
return 0;
/* child */
- fd = xopen(bb_dev_null, O_RDWR);
- dup2(fd, 0);
- dup2(fd, 1);
- dup2(fd, 2);
- while (fd > 2) close(fd--);
+ close(0);
+ xopen(bb_dev_null, O_RDWR);
+ xdup2(0, 1);
+ xdup2(0, 2);
setsid();
openlog(applet_name, LOG_PID, LOG_DAEMON);
logmode = LOGMODE_SYSLOG;
#endif
// TODO
-static inline int we_saw_this_host_before(const char *hostname)
+static inline int we_saw_this_host_before(const char *hostname UNUSED_PARAM)
{
return 0;
}
}
// NB: mp->xxx fields may be trashed on exit
-static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
+static int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
{
CLIENT *mclient;
char *hostname;
int mountport;
int proto;
#if BB_MMU
- int bg = 0;
+ smallint bg = 0;
#else
enum { bg = 0 };
#endif
- int soft;
- int intr;
- int posix;
- int nocto;
- int noac;
- int nolock;
int retry;
- int tcp;
int mountprog;
int mountvers;
int nfsprog;
int nfsvers;
int retval;
+ /* these all are one-bit really. 4.3.1 likes this combination: */
+ smallint tcp;
+ smallint soft;
+ int intr;
+ int posix;
+ int nocto;
+ int noac;
+ int nordirplus;
+ int nolock;
find_kernel_nfs_mount_version();
bb_herror_msg("%s", hostname);
goto fail;
}
- if (hp->h_length > sizeof(struct in_addr)) {
+ if ((size_t)hp->h_length > sizeof(struct in_addr)) {
bb_error_msg("got bad hp->h_length");
hp->h_length = sizeof(struct in_addr);
}
* let the kernel decide.
* timeo is filled in after we know whether it'll be TCP or UDP. */
memset(&data, 0, sizeof(data));
- data.retrans = 3;
- data.acregmin = 3;
- data.acregmax = 60;
- data.acdirmin = 30;
- data.acdirmax = 60;
- data.namlen = NAME_MAX;
+ data.retrans = 3;
+ data.acregmin = 3;
+ data.acregmax = 60;
+ data.acdirmin = 30;
+ data.acdirmax = 60;
+ data.namlen = NAME_MAX;
soft = 0;
intr = 0;
nocto = 0;
nolock = 0;
noac = 0;
+ nordirplus = 0;
retry = 10000; /* 10000 minutes ~ 1 week */
tcp = 0;
if (filteropts) for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
char *opteq = strchr(opt, '=');
if (opteq) {
+ int val, idx;
static const char options[] ALIGN1 =
/* 0 */ "rsize\0"
/* 1 */ "wsize\0"
/* 18 */ "proto\0"
/* 19 */ "namlen\0"
/* 20 */ "addr\0";
- int val = xatoi_u(opteq + 1);
- *opteq = '\0';
- switch (index_in_strings(options, opt)) {
+
+ *opteq++ = '\0';
+ idx = index_in_strings(options, opt);
+ switch (idx) {
+ case 12: // "mounthost"
+ mounthost = xstrndup(opteq,
+ strcspn(opteq, " \t\n\r,"));
+ continue;
+ case 18: // "proto"
+ if (!strncmp(opteq, "tcp", 3))
+ tcp = 1;
+ else if (!strncmp(opteq, "udp", 3))
+ tcp = 0;
+ else
+ bb_error_msg("warning: unrecognized proto= option");
+ continue;
+ case 20: // "addr" - ignore
+ continue;
+ }
+
+ val = xatoi_u(opteq);
+ switch (idx) {
case 0: // "rsize"
data.rsize = val;
- break;
+ continue;
case 1: // "wsize"
data.wsize = val;
- break;
+ continue;
case 2: // "timeo"
data.timeo = val;
- break;
+ continue;
case 3: // "retrans"
data.retrans = val;
- break;
+ continue;
case 4: // "acregmin"
data.acregmin = val;
- break;
+ continue;
case 5: // "acregmax"
data.acregmax = val;
- break;
+ continue;
case 6: // "acdirmin"
data.acdirmin = val;
- break;
+ continue;
case 7: // "acdirmax"
data.acdirmax = val;
- break;
+ continue;
case 8: // "actimeo"
data.acregmin = val;
data.acregmax = val;
data.acdirmin = val;
data.acdirmax = val;
- break;
+ continue;
case 9: // "retry"
retry = val;
- break;
+ continue;
case 10: // "port"
port = val;
- break;
+ continue;
case 11: // "mountport"
mountport = val;
- break;
- case 12: // "mounthost"
- mounthost = xstrndup(opteq+1,
- strcspn(opteq+1," \t\n\r,"));
- break;
+ continue;
case 13: // "mountprog"
mountprog = val;
- break;
+ continue;
case 14: // "mountvers"
mountvers = val;
- break;
+ continue;
case 15: // "nfsprog"
nfsprog = val;
- break;
+ continue;
case 16: // "nfsvers"
case 17: // "vers"
nfsvers = val;
- break;
- case 18: // "proto"
- if (!strncmp(opteq+1, "tcp", 3))
- tcp = 1;
- else if (!strncmp(opteq+1, "udp", 3))
- tcp = 0;
- else
- bb_error_msg("warning: unrecognized proto= option");
- break;
+ continue;
case 19: // "namlen"
- if (nfs_mount_version >= 2)
+ //if (nfs_mount_version >= 2)
data.namlen = val;
- else
- bb_error_msg("warning: option namlen is not supported\n");
- break;
- case 20: // "addr" - ignore
- break;
+ //else
+ // bb_error_msg("warning: option namlen is not supported\n");
+ continue;
default:
bb_error_msg("unknown nfs mount parameter: %s=%d", opt, val);
goto fail;
}
}
- else {
+ else { /* not of the form opt=val */
static const char options[] ALIGN1 =
"bg\0"
"fg\0"
"ac\0"
"tcp\0"
"udp\0"
- "lock\0";
+ "lock\0"
+ "rdirplus\0";
int val = 1;
if (!strncmp(opt, "no", 2)) {
val = 0;
else
bb_error_msg("warning: option nolock is not supported");
break;
+ case 11: //rdirplus
+ nordirplus = !val;
+ break;
default:
bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
goto fail;
| (intr ? NFS_MOUNT_INTR : 0)
| (posix ? NFS_MOUNT_POSIX : 0)
| (nocto ? NFS_MOUNT_NOCTO : 0)
- | (noac ? NFS_MOUNT_NOAC : 0);
+ | (noac ? NFS_MOUNT_NOAC : 0)
+ | (nordirplus ? NFS_MOUNT_NORDIRPLUS : 0);
if (nfs_mount_version >= 2)
data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
if (nfs_mount_version >= 3)
if (hp == NULL) {
bb_herror_msg("%s", mounthost);
goto fail;
- } else {
- if (hp->h_length > sizeof(struct in_addr)) {
- bb_error_msg("got bad hp->h_length?");
- hp->h_length = sizeof(struct in_addr);
- }
- mount_server_addr.sin_family = AF_INET;
- memcpy(&mount_server_addr.sin_addr,
- hp->h_addr, hp->h_length);
}
+ if ((size_t)hp->h_length > sizeof(struct in_addr)) {
+ bb_error_msg("got bad hp->h_length");
+ hp->h_length = sizeof(struct in_addr);
+ }
+ mount_server_addr.sin_family = AF_INET;
+ memcpy(&mount_server_addr.sin_addr,
+ hp->h_addr, hp->h_length);
}
}
{
struct timeval total_timeout;
struct timeval retry_timeout;
- struct pmap* pm_mnt;
+ struct pmap pm_mnt;
time_t t;
time_t prevt;
time_t timeout;
retry_timeout.tv_usec = 0;
total_timeout.tv_sec = 20;
total_timeout.tv_usec = 0;
+//FIXME: use monotonic()?
timeout = time(NULL) + 60 * retry;
prevt = 0;
t = 30;
-retry:
+ retry:
/* be careful not to use too many CPU cycles */
if (t - prevt < 30)
sleep(30);
- pm_mnt = get_mountport(&mount_server_addr,
+ get_mountport(&pm_mnt, &mount_server_addr,
mountprog,
mountvers,
proto,
mountport);
- nfsvers = (pm_mnt->pm_vers < 2) ? 2 : pm_mnt->pm_vers;
+ nfsvers = (pm_mnt.pm_vers < 2) ? 2 : pm_mnt.pm_vers;
/* contact the mount daemon via TCP */
- mount_server_addr.sin_port = htons(pm_mnt->pm_port);
+ mount_server_addr.sin_port = htons(pm_mnt.pm_port);
msock = RPC_ANYSOCK;
- switch (pm_mnt->pm_prot) {
+ switch (pm_mnt.pm_prot) {
case IPPROTO_UDP:
mclient = clntudp_create(&mount_server_addr,
- pm_mnt->pm_prog,
- pm_mnt->pm_vers,
+ pm_mnt.pm_prog,
+ pm_mnt.pm_vers,
retry_timeout,
&msock);
if (mclient)
break;
- mount_server_addr.sin_port = htons(pm_mnt->pm_port);
+ mount_server_addr.sin_port = htons(pm_mnt.pm_port);
msock = RPC_ANYSOCK;
case IPPROTO_TCP:
mclient = clnttcp_create(&mount_server_addr,
- pm_mnt->pm_prog,
- pm_mnt->pm_vers,
+ pm_mnt.pm_prog,
+ pm_mnt.pm_vers,
&msock, 0, 0);
break;
default:
*/
memset(&status, 0, sizeof(status));
- if (pm_mnt->pm_vers == 3)
+ if (pm_mnt.pm_vers == 3)
clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
(xdrproc_t) xdr_dirpath,
(caddr_t) &pathname,
goto retry;
}
-prepare_kernel_data:
+ prepare_kernel_data:
if (nfsvers == 2) {
if (status.nfsv2.fhs_status != 0) {
if (!daemonized) {
daemonized = daemonize();
if (daemonized <= 0) { /* parent or error */
- // FIXME: parent doesn't close fsock - ??!
+// FIXME: parent doesn't close fsock - ??!
retval = -daemonized;
goto ret;
}
}
}
-do_mount: /* perform actual mount */
+ do_mount: /* perform actual mount */
mp->mnt_type = (char*)"nfs";
retval = mount_it_now(mp, vfsflags, (char*)&data);
goto ret;
-fail: /* abort */
+ fail: /* abort */
if (msock >= 0) {
if (mclient) {
if (fsock >= 0)
close(fsock);
-ret:
+ ret:
free(hostname);
free(mounthost);
free(filteropts);
#else /* !ENABLE_FEATURE_MOUNT_NFS */
/* Never called. Call should be optimized out. */
-int nfsmount(struct mntent *mp, int vfsflags, char *filteropts);
+int nfsmount(struct mntent *mp, long vfsflags, char *filteropts);
#endif /* !ENABLE_FEATURE_MOUNT_NFS */
// NB: mp->xxx fields may be trashed on exit
static int singlemount(struct mntent *mp, int ignore_busy)
{
- int rc = -1, vfsflags;
+ int rc = -1;
+ long vfsflags;
char *loopFile = 0, *filteropts = 0;
llist_t *fl = 0;
struct stat st;
// Treat fstype "auto" as unspecified.
- if (mp->mnt_type && strcmp(mp->mnt_type,"auto") == 0)
- mp->mnt_type = 0;
+ if (mp->mnt_type && strcmp(mp->mnt_type, "auto") == 0)
+ mp->mnt_type = NULL;
+
+ // Might this be a virtual filesystem?
+
+ if (ENABLE_FEATURE_MOUNT_HELPERS
+ && (strchr(mp->mnt_fsname, '#'))
+ ) {
+ char *s, *p, *args[35];
+ int n = 0;
+// FIXME: does it allow execution of arbitrary commands?!
+// What args[0] can end up with?
+ for (s = p = mp->mnt_fsname; *s && n < 35-3; ++s) {
+ if (s[0] == '#' && s[1] != '#') {
+ *s = '\0';
+ args[n++] = p;
+ p = s + 1;
+ }
+ }
+ args[n++] = p;
+ args[n++] = mp->mnt_dir;
+ args[n] = NULL;
+ rc = wait4pid(xspawn(args));
+ goto report_error;
+ }
// Might this be an CIFS filesystem?
if (ENABLE_FEATURE_MOUNT_CIFS
- && (!mp->mnt_type || strcmp(mp->mnt_type,"cifs") == 0)
- && (mp->mnt_fsname[0]=='/' || mp->mnt_fsname[0]=='\\')
- && mp->mnt_fsname[0]==mp->mnt_fsname[1]
+ && (!mp->mnt_type || strcmp(mp->mnt_type, "cifs") == 0)
+ && (mp->mnt_fsname[0] == '/' || mp->mnt_fsname[0] == '\\')
+ && mp->mnt_fsname[0] == mp->mnt_fsname[1]
) {
len_and_sockaddr *lsa;
char *ip, *dotted;
// insert ip=... option into string flags.
- dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa);
+ dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
ip = xasprintf("ip=%s", dotted);
parse_mount_options(ip, &filteropts);
static const char must_be_root[] ALIGN1 = "you must be root";
-int mount_main(int argc, char **argv);
-int mount_main(int argc, char **argv)
+int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mount_main(int argc UNUSED_PARAM, char **argv)
{
- enum { OPT_ALL = 0x10 };
-
- char *cmdopts = xstrdup(""), *fstype=0, *storage_path=0;
+ char *cmdopts = xstrdup("");
+ char *fstype = NULL;
+ char *storage_path;
char *opt_o;
const char *fstabname;
FILE *fstab;
unsigned opt;
struct mntent mtpair[2], *mtcur = mtpair;
SKIP_DESKTOP(const int nonroot = 0;)
- USE_DESKTOP( int nonroot = (getuid() != 0);)
- /* parse long options, like --bind and --move. Note that -o option
- * and --option are synonymous. Yes, this means --remount,rw works. */
+ USE_DESKTOP(int nonroot = ) sanitize_env_if_suid();
- for (i = j = 0; i < argc; i++) {
- if (argv[i][0] == '-' && argv[i][1] == '-') {
- append_mount_options(&cmdopts, argv[i]+2);
- } else argv[j++] = argv[i];
+ // Parse long options, like --bind and --move. Note that -o option
+ // and --option are synonymous. Yes, this means --remount,rw works.
+ for (i = j = 1; argv[i]; i++) {
+ if (argv[i][0] == '-' && argv[i][1] == '-')
+ append_mount_options(&cmdopts, argv[i] + 2);
+ else
+ argv[j++] = argv[i];
}
- argv[j] = 0;
- argc = j;
+ argv[j] = NULL;
// Parse remaining options
-
- opt = getopt32(argv, "o:t:rwanfvsi", &opt_o, &fstype);
- if (opt & 0x1) append_mount_options(&cmdopts, opt_o); // -o
- //if (opt & 0x2) // -t
- if (opt & 0x4) append_mount_options(&cmdopts, "ro"); // -r
- if (opt & 0x8) append_mount_options(&cmdopts, "rw"); // -w
- //if (opt & 0x10) // -a
- if (opt & 0x20) USE_FEATURE_MTAB_SUPPORT(useMtab = 0); // -n
- if (opt & 0x40) USE_FEATURE_MTAB_SUPPORT(fakeIt = 1); // -f
- //if (opt & 0x80) // -v: verbose (ignore)
- //if (opt & 0x100) // -s: sloppy (ignore)
- //if (opt & 0x200) // -i: don't call mount.<fstype> (ignore)
+ // Max 2 params; -v is a counter
+ opt_complementary = "?2" USE_FEATURE_MOUNT_VERBOSE(":vv");
+ opt = getopt32(argv, OPTION_STR, &opt_o, &fstype
+ USE_FEATURE_MOUNT_VERBOSE(, &verbose));
+ if (opt & OPT_o) append_mount_options(&cmdopts, opt_o); // -o
+ if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r
+ if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w
argv += optind;
- argc -= optind;
-
- // Three or more non-option arguments? Die with a usage message.
-
- if (argc > 2) bb_show_usage();
// If we have no arguments, show currently mounted filesystems
-
- if (!argc) {
- if (!(opt & OPT_ALL)) {
+ if (!argv[0]) {
+ if (!(opt & OPT_a)) {
FILE *mountTable = setmntent(bb_path_mtab_file, "r");
- if (!mountTable) bb_error_msg_and_die("no %s", bb_path_mtab_file);
+ if (!mountTable)
+ bb_error_msg_and_die("no %s", bb_path_mtab_file);
- while (getmntent_r(mountTable, mtpair, bb_common_bufsiz1,
- sizeof(bb_common_bufsiz1)))
+ while (getmntent_r(mountTable, &mtpair[0], getmntent_buf,
+ GETMNTENT_BUFSIZE))
{
// Don't show rootfs. FIXME: why??
// util-linux 2.12a happily shows rootfs...
mtpair->mnt_dir, mtpair->mnt_type,
mtpair->mnt_opts);
}
- if (ENABLE_FEATURE_CLEAN_UP) endmntent(mountTable);
+ if (ENABLE_FEATURE_CLEAN_UP)
+ endmntent(mountTable);
return EXIT_SUCCESS;
}
- } else storage_path = bb_simplify_path(argv[0]);
-
- // When we have two arguments, the second is the directory and we can
- // skip looking at fstab entirely. We can always abspath() the directory
- // argument when we get it.
-
- if (argc == 2) {
- if (nonroot)
- bb_error_msg_and_die(must_be_root);
- mtpair->mnt_fsname = argv[0];
- mtpair->mnt_dir = argv[1];
- mtpair->mnt_type = fstype;
- mtpair->mnt_opts = cmdopts;
- rc = singlemount(mtpair, 0);
- goto clean_up;
+ storage_path = NULL;
+ } else {
+ // When we have two arguments, the second is the directory and we can
+ // skip looking at fstab entirely. We can always abspath() the directory
+ // argument when we get it.
+ if (argv[1]) {
+ if (nonroot)
+ bb_error_msg_and_die(must_be_root);
+ mtpair->mnt_fsname = argv[0];
+ mtpair->mnt_dir = argv[1];
+ mtpair->mnt_type = fstype;
+ mtpair->mnt_opts = cmdopts;
+ if (ENABLE_FEATURE_MOUNT_LABEL) {
+ resolve_mount_spec(&mtpair->mnt_fsname);
+ }
+ rc = singlemount(mtpair, 0);
+ return rc;
+ }
+ storage_path = bb_simplify_path(argv[0]); // malloced
}
- i = parse_mount_options(cmdopts, 0);
+ // Past this point, we are handling either "mount -a [opts]"
+ // or "mount [opts] single_param"
+
+ i = parse_mount_options(cmdopts, 0); // FIXME: should be "long", not "int"
if (nonroot && (i & ~MS_SILENT)) // Non-root users cannot specify flags
bb_error_msg_and_die(must_be_root);
// If we have a shared subtree flag, don't worry about fstab or mtab.
-
if (ENABLE_FEATURE_MOUNT_FLAGS
&& (i & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
) {
- rc = mount("", argv[0], "", i, "");
- if (rc) bb_perror_msg_and_die("%s", argv[0]);
- goto clean_up;
+ rc = verbose_mount(/*source:*/ "", /*target:*/ argv[0],
+ /*type:*/ "", /*flags:*/ i, /*data:*/ "");
+ if (rc)
+ bb_simple_perror_msg_and_die(argv[0]);
+ return rc;
}
// Open either fstab or mtab
-
fstabname = "/etc/fstab";
if (i & MS_REMOUNT) {
+ // WARNING. I am not sure this matches util-linux's
+ // behavior. It's possible util-linux does not
+ // take -o opts from mtab (takes only mount source).
fstabname = bb_path_mtab_file;
}
fstab = setmntent(fstabname, "r");
if (!fstab)
bb_perror_msg_and_die("cannot read %s", fstabname);
- // Loop through entries until we find what we're looking for.
-
+ // Loop through entries until we find what we're looking for
memset(mtpair, 0, sizeof(mtpair));
for (;;) {
- struct mntent *mtnext = (mtcur==mtpair ? mtpair+1 : mtpair);
+ struct mntent *mtother = (mtcur==mtpair ? mtpair+1 : mtpair);
// Get next fstab entry
-
- 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?
-
- if (argc) {
-
- // If we didn't find anything, complain.
-
- if (!mtnext->mnt_fsname)
- bb_error_msg_and_die("can't find %s in %s",
- argv[0], fstabname);
-
- mtcur = mtnext;
- if (nonroot) {
- // fstab must have "users" or "user"
- if (!(parse_mount_options(mtcur->mnt_opts, 0) & MOUNT_USERS))
- bb_error_msg_and_die(must_be_root);
- }
-
- // Mount the last thing we found.
-
- mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
- append_mount_options(&(mtcur->mnt_opts), cmdopts);
- rc = singlemount(mtcur, 0);
- free(mtcur->mnt_opts);
- }
- goto clean_up;
+ if (!getmntent_r(fstab, mtcur, getmntent_buf
+ + (mtcur==mtpair ? GETMNTENT_BUFSIZE/2 : 0),
+ GETMNTENT_BUFSIZE/2)
+ ) { // End of fstab/mtab is reached
+ mtcur = mtother; // the thing we found last time
+ break;
}
- /* If we're trying to mount something specific and this isn't it,
- * skip it. Note we must match both the exact text in fstab (ala
- * "proc") or a full path from root */
-
- if (argc) {
+ // If we're trying to mount something specific and this isn't it,
+ // skip it. Note we must match the exact text in fstab (ala
+ // "proc") or a full path from root
+ if (argv[0]) {
// Is this what we're looking for?
-
if (strcmp(argv[0], mtcur->mnt_fsname) &&
strcmp(storage_path, mtcur->mnt_fsname) &&
strcmp(argv[0], mtcur->mnt_dir) &&
strcmp(storage_path, mtcur->mnt_dir)) continue;
- // Remember this entry. Something later may have overmounted
- // it, and we want the _last_ match.
-
- mtcur = mtnext;
-
- // If we're mounting all.
+ // Remember this entry. Something later may have
+ // overmounted it, and we want the _last_ match.
+ mtcur = mtother;
+ // If we're mounting all
} else {
// Do we need to match a filesystem type?
- if (fstype && match_fstype(mtcur, fstype)) continue;
+ if (fstype && match_fstype(mtcur, fstype))
+ continue;
// Skip noauto and swap anyway.
-
- if (parse_mount_options(mtcur->mnt_opts, 0)
- & (MOUNT_NOAUTO | MOUNT_SWAP)) continue;
+ if (parse_mount_options(mtcur->mnt_opts, 0) & (MOUNT_NOAUTO | MOUNT_SWAP))
+ continue;
// No, mount -a won't mount anything,
- // even user mounts, for mere humans.
-
+ // even user mounts, for mere humans
if (nonroot)
bb_error_msg_and_die(must_be_root);
- // Mount this thing.
+ // Mount this thing
+ if (ENABLE_FEATURE_MOUNT_LABEL)
+ resolve_mount_spec(&mtpair->mnt_fsname);
// NFS mounts want this to be xrealloc-able
mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
if (singlemount(mtcur, 1)) {
- /* Count number of failed mounts */
+ // Count number of failed mounts
rc++;
}
free(mtcur->mnt_opts);
}
}
- if (ENABLE_FEATURE_CLEAN_UP) endmntent(fstab);
-clean_up:
+ // End of fstab/mtab is reached.
+ // Were we looking for something specific?
+ if (argv[0]) {
+ // If we didn't find anything, complain
+ if (!mtcur->mnt_fsname)
+ bb_error_msg_and_die("can't find %s in %s",
+ argv[0], fstabname);
+ if (nonroot) {
+ // fstab must have "users" or "user"
+ if (!(parse_mount_options(mtcur->mnt_opts, 0) & MOUNT_USERS))
+ bb_error_msg_and_die(must_be_root);
+ }
+
+ // Mount the last thing we found
+ mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
+ append_mount_options(&(mtcur->mnt_opts), cmdopts);
+ if (ENABLE_FEATURE_MOUNT_LABEL) {
+ resolve_mount_spec(&mtpair->mnt_fsname);
+ }
+ rc = singlemount(mtcur, 0);
+ if (ENABLE_FEATURE_CLEAN_UP)
+ free(mtcur->mnt_opts);
+ }
+ if (ENABLE_FEATURE_CLEAN_UP)
+ endmntent(fstab);
if (ENABLE_FEATURE_CLEAN_UP) {
free(storage_path);
free(cmdopts);
}
-
return rc;
}
projects / platform / upstream / busybox.git / blobdiff