#include <rpc/pmap_clnt.h>
+#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)
+{
+ /* *** XXX FIXME WARNING: This hack is NOT thread safe. --Sampo */
+ struct mntent* ment = getmntent(stream);
+ memcpy(result, ment, sizeof(struct mntent));
+ return result;
+}
+#endif
+
+
// Not real flags, but we want to be able to check for this.
-#define MOUNT_NOAUTO (1<<29)
-#define MOUNT_SWAP (1<<30)
+enum {
+ MOUNT_USERS = (1<<28)*ENABLE_DESKTOP,
+ MOUNT_NOAUTO = (1<<29),
+ MOUNT_SWAP = (1<<30),
+};
+// TODO: more "user" flag compatibility.
+// "user" option (from mount manpage):
+// Only the user that mounted a filesystem can unmount it again.
+// If any user should be able to unmount, then use users instead of user
+// in the fstab line. The owner option is similar to the user option,
+// with the restriction that the user must be the owner of the special file.
+// This may be useful e.g. for /dev/fd if a login script makes
+// the console user owner of this device.
/* Standard mount options (from -o options or --options), with corresponding
* flags */
struct {
- char *name;
+ const char *name;
long flags;
} static mount_options[] = {
// MS_FLAGS set a bit. ~MS_FLAGS disable that bit. 0 flags are NOPs.
USE_FEATURE_MOUNT_FSTAB(
{"defaults", 0},
- {"quiet", 0},
- {"noauto",MOUNT_NOAUTO},
- {"swap",MOUNT_SWAP},
+ /* {"quiet", 0}, - do not filter out, vfat wants to see it */
+ {"noauto", MOUNT_NOAUTO},
+ {"swap", MOUNT_SWAP},
+ USE_DESKTOP({"user", MOUNT_USERS},)
+ USE_DESKTOP({"users", MOUNT_USERS},)
)
USE_FEATURE_MOUNT_FLAGS(
#define VECTOR_SIZE(v) (sizeof(v) / sizeof((v)[0]))
/* Append mount options to string */
-static void append_mount_options(char **oldopts, char *newopts)
+static void append_mount_options(char **oldopts, const char *newopts)
{
if (*oldopts && **oldopts) {
/* do not insert options which are already there */
if (p) len = p - newopts;
p = *oldopts;
while (1) {
- if (!strncmp(p,newopts,len) && (p[len]==',' || p[len]==0))
+ if (!strncmp(p, newopts, len)
+ && (p[len]==',' || p[len]==0))
goto skip;
p = strchr(p,',');
if(!p) break;
static llist_t *get_block_backed_filesystems(void)
{
- char *fs, *buf,
- *filesystems[] = {"/etc/filesystems", "/proc/filesystems", 0};
+ static const char *const filesystems[] = {
+ "/etc/filesystems",
+ "/proc/filesystems",
+ 0
+ };
+ char *fs, *buf;
llist_t *list = 0;
int i;
FILE *f;
f = fopen(filesystems[i], "r");
if (!f) continue;
- for (fs = buf = 0; (fs = buf = bb_get_chomped_line_from_file(f));
- free(buf))
- {
- if (!strncmp(buf,"nodev",5) && isspace(buf[5])) continue;
-
- while (isspace(*fs)) fs++;
- if (*fs=='#' || *fs=='*') continue;
- if (!*fs) continue;
+ while ((buf = xmalloc_getline(f)) != 0) {
+ if (!strncmp(buf, "nodev", 5) && isspace(buf[5]))
+ continue;
+ fs = skip_whitespace(buf);
+ if (*fs=='#' || *fs=='*' || !*fs) continue;
- llist_add_to_end(&list,xstrdup(fs));
+ llist_add_to_end(&list, xstrdup(fs));
+ free(buf);
}
if (ENABLE_FEATURE_CLEAN_UP) fclose(f);
}
/* If the mount was successful, and we're maintaining an old-style
* mtab file by hand, add the new entry to it now. */
-mtab:
+ mtab:
if (ENABLE_FEATURE_MTAB_SUPPORT && useMtab && !rc && !(vfsflags & MS_REMOUNT)) {
char *fsname;
FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
int i;
- if (!mountTable)
+ if (!mountTable) {
bb_error_msg("no %s",bb_path_mtab_file);
+ goto ret;
+ }
// Add vfs string flags
fsname = 0;
if (!mp->mnt_type || !*mp->mnt_type) { /* bind mount */
mp->mnt_fsname = fsname = bb_simplify_path(mp->mnt_fsname);
- mp->mnt_type = "bind";
+ mp->mnt_type = (char*)"bind";
}
mp->mnt_freq = mp->mnt_passno = 0;
free(fsname);
}
}
-
+ ret:
return rc;
}
short pc_name_max;
short pc_path_max;
short pc_pipe_buf;
- u_char pc_vdisable;
+ uint8_t pc_vdisable;
char pc_xxx;
short pc_mask[2];
};
static struct pmap p = {0, 0, 0, 0};
server_addr->sin_port = PMAPPORT;
+/* glibc 2.4 (still) has pmap_getmaps(struct sockaddr_in *).
+ * I understand it like "IPv6 for this is not 100% ready" */
pmap = pmap_getmaps(server_addr);
if (version > MAX_NFSPROT)
dup2(fd, 0);
dup2(fd, 1);
dup2(fd, 2);
- if (fd > 2) close(fd);
+ while (fd > 2) close(fd--);
setsid();
- openlog(bb_applet_name, LOG_PID, LOG_DAEMON);
+ openlog(applet_name, LOG_PID, LOG_DAEMON);
logmode = LOGMODE_SYSLOG;
return 1;
}
for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
char *opteq = strchr(opt, '=');
if (opteq) {
- int val = atoi(opteq + 1);
+ const char *const options[] = {
+ /* 0 */ "rsize",
+ /* 1 */ "wsize",
+ /* 2 */ "timeo",
+ /* 3 */ "retrans",
+ /* 4 */ "acregmin",
+ /* 5 */ "acregmax",
+ /* 6 */ "acdirmin",
+ /* 7 */ "acdirmax",
+ /* 8 */ "actimeo",
+ /* 9 */ "retry",
+ /* 10 */ "port",
+ /* 11 */ "mountport",
+ /* 12 */ "mounthost",
+ /* 13 */ "mountprog",
+ /* 14 */ "mountvers",
+ /* 15 */ "nfsprog",
+ /* 16 */ "nfsvers",
+ /* 17 */ "vers",
+ /* 18 */ "proto",
+ /* 19 */ "namlen",
+ /* 20 */ "addr",
+ NULL
+ };
+ int val = xatoi_u(opteq + 1);
*opteq = '\0';
- if (!strcmp(opt, "rsize"))
+ switch (index_in_str_array(options, opt)) {
+ case 0: // "rsize"
data.rsize = val;
- else if (!strcmp(opt, "wsize"))
+ break;
+ case 1: // "wsize"
data.wsize = val;
- else if (!strcmp(opt, "timeo"))
+ break;
+ case 2: // "timeo"
data.timeo = val;
- else if (!strcmp(opt, "retrans"))
+ break;
+ case 3: // "retrans"
data.retrans = val;
- else if (!strcmp(opt, "acregmin"))
+ break;
+ case 4: // "acregmin"
data.acregmin = val;
- else if (!strcmp(opt, "acregmax"))
+ break;
+ case 5: // "acregmax"
data.acregmax = val;
- else if (!strcmp(opt, "acdirmin"))
+ break;
+ case 6: // "acdirmin"
data.acdirmin = val;
- else if (!strcmp(opt, "acdirmax"))
+ break;
+ case 7: // "acdirmax"
data.acdirmax = val;
- else if (!strcmp(opt, "actimeo")) {
+ break;
+ case 8: // "actimeo"
data.acregmin = val;
data.acregmax = val;
data.acdirmin = val;
data.acdirmax = val;
- }
- else if (!strcmp(opt, "retry"))
+ break;
+ case 9: // "retry"
retry = val;
- else if (!strcmp(opt, "port"))
+ break;
+ case 10: // "port"
port = val;
- else if (!strcmp(opt, "mountport"))
+ break;
+ case 11: // "mountport"
mountport = val;
- else if (!strcmp(opt, "mounthost"))
+ break;
+ case 12: // "mounthost"
mounthost = xstrndup(opteq+1,
- strcspn(opteq+1," \t\n\r,"));
- else if (!strcmp(opt, "mountprog"))
+ strcspn(opteq+1," \t\n\r,"));
+ break;
+ case 13: // "mountprog"
mountprog = val;
- else if (!strcmp(opt, "mountvers"))
+ break;
+ case 14: // "mountvers"
mountvers = val;
- else if (!strcmp(opt, "nfsprog"))
+ break;
+ case 15: // "nfsprog"
nfsprog = val;
- else if (!strcmp(opt, "nfsvers") ||
- !strcmp(opt, "vers"))
+ break;
+ case 16: // "nfsvers"
+ case 17: // "vers"
nfsvers = val;
- else if (!strcmp(opt, "proto")) {
+ 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");
- } else if (!strcmp(opt, "namlen")) {
+ break;
+ case 19: // "namlen"
if (nfs_mount_version >= 2)
data.namlen = val;
else
bb_error_msg("warning: option namlen is not supported\n");
- } else if (!strcmp(opt, "addr"))
- /* ignore */;
- else {
+ break;
+ case 20: // "addr" - ignore
+ break;
+ default:
bb_error_msg("unknown nfs mount parameter: %s=%d", opt, val);
goto fail;
}
}
else {
+ const char *const options[] = {
+ "bg",
+ "fg",
+ "soft",
+ "hard",
+ "intr",
+ "posix",
+ "cto",
+ "ac",
+ "tcp",
+ "udp",
+ "lock",
+ NULL
+ };
int val = 1;
if (!strncmp(opt, "no", 2)) {
val = 0;
opt += 2;
}
- if (!strcmp(opt, "bg"))
+ switch (index_in_str_array(options, opt)) {
+ case 0: // "bg"
bg = val;
- else if (!strcmp(opt, "fg"))
+ break;
+ case 1: // "fg"
bg = !val;
- else if (!strcmp(opt, "soft"))
+ break;
+ case 2: // "soft"
soft = val;
- else if (!strcmp(opt, "hard"))
+ break;
+ case 3: // "hard"
soft = !val;
- else if (!strcmp(opt, "intr"))
+ break;
+ case 4: // "intr"
intr = val;
- else if (!strcmp(opt, "posix"))
+ break;
+ case 5: // "posix"
posix = val;
- else if (!strcmp(opt, "cto"))
+ break;
+ case 6: // "cto"
nocto = !val;
- else if (!strcmp(opt, "ac"))
+ break;
+ case 7: // "ac"
noac = !val;
- else if (!strcmp(opt, "tcp"))
+ break;
+ case 8: // "tcp"
tcp = val;
- else if (!strcmp(opt, "udp"))
+ break;
+ case 9: // "udp"
tcp = !val;
- else if (!strcmp(opt, "lock")) {
+ break;
+ case 10: // "lock"
if (nfs_mount_version >= 3)
nolock = !val;
else
bb_error_msg("warning: option nolock is not supported");
- } else {
+ break;
+ default:
bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
goto fail;
}
do_mount: /* perform actual mount */
- mp->mnt_type = "nfs";
+ mp->mnt_type = (char*)"nfs";
retval = mount_it_now(mp, vfsflags, (char*)&data);
goto ret;
// Treat fstype "auto" as unspecified.
- if (mp->mnt_type && !strcmp(mp->mnt_type,"auto")) mp->mnt_type = 0;
+ if (mp->mnt_type && strcmp(mp->mnt_type,"auto") == 0)
+ mp->mnt_type = 0;
// Might this be an CIFS filesystem?
- if (ENABLE_FEATURE_MOUNT_CIFS &&
- (!mp->mnt_type || !strcmp(mp->mnt_type,"cifs")) &&
- (mp->mnt_fsname[0]==mp->mnt_fsname[1] && (mp->mnt_fsname[0]=='/' || mp->mnt_fsname[0]=='\\')))
- {
- struct hostent *he;
- char ip[32], *s;
+ 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]
+ ) {
+ len_and_sockaddr *lsa;
+ char *ip, *dotted;
+ char *s;
rc = 1;
// Replace '/' with '\' and verify that unc points to "//server/share".
// get server IP
s = strrchr(mp->mnt_fsname, '\\');
- if (s == mp->mnt_fsname+1) goto report_error;
- *s = 0;
- he = gethostbyname(mp->mnt_fsname+2);
+ if (s <= mp->mnt_fsname+1) goto report_error;
+ *s = '\0';
+ lsa = host2sockaddr(mp->mnt_fsname+2, 0);
*s = '\\';
- if (!he) goto report_error;
+ if (!lsa) goto report_error;
- // Insert ip=... option into string flags. (NOTE: Add IPv6 support.)
+ // insert ip=... option into string flags.
- sprintf(ip, "ip=%d.%d.%d.%d", he->h_addr[0], he->h_addr[1],
- he->h_addr[2], he->h_addr[3]);
+ dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len);
+ ip = xasprintf("ip=%s", dotted);
parse_mount_options(ip, &filteropts);
// compose new unc '\\server-ip\share'
+ // (s => slash after hostname)
- mp->mnt_fsname = xasprintf("\\\\%s%s", ip+3,
- strchr(mp->mnt_fsname+2,'\\'));
+ mp->mnt_fsname = xasprintf("\\\\%s%s", dotted, s);
// lock is required
vfsflags |= MS_MANDLOCK;
- mp->mnt_type = "cifs";
+ mp->mnt_type = (char*)"cifs";
rc = mount_it_now(mp, vfsflags, filteropts);
- if (ENABLE_FEATURE_CLEAN_UP) free(mp->mnt_fsname);
+ if (ENABLE_FEATURE_CLEAN_UP) {
+ free(mp->mnt_fsname);
+ free(ip);
+ free(dotted);
+ free(lsa);
+ }
goto report_error;
}
// Might this be an NFS filesystem?
- if (ENABLE_FEATURE_MOUNT_NFS &&
- (!mp->mnt_type || !strcmp(mp->mnt_type,"nfs")) &&
- strchr(mp->mnt_fsname, ':') != NULL)
- {
+ if (ENABLE_FEATURE_MOUNT_NFS
+ && (!mp->mnt_type || !strcmp(mp->mnt_type,"nfs"))
+ && strchr(mp->mnt_fsname, ':') != NULL
+ ) {
rc = nfsmount(mp, vfsflags, filteropts);
goto report_error;
}
// 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) && !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE)))
- {
+ if (!lstat(mp->mnt_fsname, &st)
+ && !(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 (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE)))
rc = mount_it_now(mp, vfsflags, filteropts);
-
- // Loop through filesystem types until mount succeeds or we run out
-
else {
+ // Loop through filesystem types until mount succeeds
+ // or we run out
/* Initialize list of block backed filesystems. This has to be
* done here so that during "mount -a", mounts after /proc shows up
}
}
-report_error:
- if (ENABLE_FEATURE_CLEAN_UP) free(filteropts);
+ report_error:
+ if (ENABLE_FEATURE_CLEAN_UP)
+ free(filteropts);
if (rc && errno == EBUSY && ignore_busy) rc = 0;
if (rc < 0)
// Parse options, if necessary parse fstab/mtab, and call singlemount for
// each directory to be mounted.
+const char must_be_root[] = "you must be root";
+
+int mount_main(int argc, char **argv);
int mount_main(int argc, char **argv)
{
enum { OPT_ALL = 0x10 };
int i, j, rc = 0;
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. */
for (i = j = 0; i < argc; i++) {
if (argv[i][0] == '-' && argv[i][1] == '-') {
- append_mount_options(&cmdopts,argv[i]+2);
+ append_mount_options(&cmdopts, argv[i]+2);
} else argv[j++] = argv[i];
}
argv[j] = 0;
if (!(opt & OPT_ALL)) {
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,
+ while (getmntent_r(mountTable, mtpair, bb_common_bufsiz1,
sizeof(bb_common_bufsiz1)))
{
- // Don't show rootfs.
- if (!strcmp(mtpair->mnt_fsname, "rootfs")) continue;
+ // Don't show rootfs. FIXME: why??
+ // util-linux 2.12a happily shows rootfs...
+ //if (!strcmp(mtpair->mnt_fsname, "rootfs")) continue;
if (!fstype || !strcmp(mtpair->mnt_type, fstype))
printf("%s on %s type %s (%s)\n", mtpair->mnt_fsname,
// 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;
}
i = parse_mount_options(cmdopts, 0);
+ 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 )))
- {
+ 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;
// Open either fstab or mtab
- if (i & MS_REMOUNT)
+ fstabname = "/etc/fstab";
+ if (i & MS_REMOUNT) {
fstabname = bb_path_mtab_file;
- else fstabname = "/etc/fstab";
- fstab = setmntent(fstabname,"r");
+ }
+ fstab = setmntent(fstabname, "r");
if (!fstab)
bb_perror_msg_and_die("cannot read %s", fstabname);
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 = mtnext;
mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
- append_mount_options(&(mtcur->mnt_opts),cmdopts);
+ append_mount_options(&(mtcur->mnt_opts), cmdopts);
rc = singlemount(mtcur, 0);
free(mtcur->mnt_opts);
}
// 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;
+ 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.
// If we're mounting all.
} else {
-
// Do we need to match a filesystem type?
- if (fstype && strcmp(mtcur->mnt_type,fstype)) continue;
+ // TODO: support "-t type1,type2"; "-t notype1,type2"
+
+ if (fstype && strcmp(mtcur->mnt_type, fstype)) continue;
// Skip noauto and swap anyway.
- if (parse_mount_options(mtcur->mnt_opts,0)
+ 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.
+
+ if (nonroot)
+ bb_error_msg_and_die(must_be_root);
+
// Mount this thing.
+ // NFS mounts want this to be xrealloc-able
+ mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
if (singlemount(mtcur, 1)) {
/* Count number of failed mounts */
rc++;
}
+ free(mtcur->mnt_opts);
}
}
if (ENABLE_FEATURE_CLEAN_UP) endmntent(fstab);
projects / oweals / busybox.git / blobdiff