X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=4698d85fd98f6f9cd30c00f8644dff26ceb41082;hp=cdccfe894778a957245242c1657c87629c4659b9;hb=33f60147abb70ce36017c58366b0a1710453bb00;hpb=ae5ec51e0ddc99dc5552e51bd5c095084dbb61aa diff --git a/utils/mount/mount.c b/utils/mount/mount.c index cdccfe8..4698d85 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -99,11 +99,9 @@ static const struct opt_map opt_map[] = { { "rbind", 0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */ { "auto", 0, 0, MS_DUMMY }, /* Can be mounted using -a */ { "noauto", 0, 0, MS_DUMMY }, /* Can only be mounted explicitly */ - { "users", 1, 0, MS_USERS|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "users", 1, 0, MS_USERS }, /* Allow ordinary user to mount */ { "nousers", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ - { "user", 1, 0, MS_USER|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "user", 1, 0, MS_USER }, /* Allow ordinary user to mount */ { "nouser", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ { "owner", 0, 0, MS_DUMMY }, /* Let the owner of the device mount */ { "noowner", 0, 0, MS_DUMMY }, /* Device owner has no special privs */ @@ -179,6 +177,11 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt ment.mnt_freq = 0; ment.mnt_passno= 0; + if(flags & MS_REMOUNT) { + update_mtab(ment.mnt_dir, &ment); + return 0; + } + lock_mtab(); if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { @@ -256,34 +259,46 @@ static void parse_opts (const char *options, int *flags, char **extra_opts) { if (options != NULL) { char *opts = xstrdup(options); - char *opt; - int len = strlen(opts) + 20; + char *opt, *p; + int len = strlen(opts) + 1; /* include room for a null */ + int open_quote = 0; *extra_opts = xmalloc(len); **extra_opts = '\0'; - for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) - parse_opt(opt, flags, *extra_opts, len); - + for (p=opts, opt=NULL; p && *p; p++) { + if (!opt) + opt = p; /* begin of the option item */ + if (*p == '"') + open_quote ^= 1; /* reverse the status */ + if (open_quote) + continue; /* still in a quoted block */ + if (*p == ',') + *p = '\0'; /* terminate the option item */ + /* end of option item or last item */ + if (*p == '\0' || *(p+1) == '\0') { + parse_opt(opt, flags, *extra_opts, len); + opt = NULL; + } + } free(opts); } - } static void mount_error(char *node) { switch(errno) { case ENOTDIR: - printf("%s: mount point %s is not a directory\n", progname, node); + fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node); break; case EBUSY: - printf("%s: %s is already mounted or busy\n", progname, node); + fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node); break; case ENOENT: - printf("%s: mount point %s does not exist\n", progname, node); + fprintf(stderr, "%s: mount point %s does not exist\n", progname, node); break; default: - printf("%s: %s\n", progname, strerror(errno)); + fprintf(stderr, "%s: %s\n", progname, strerror(errno)); } } @@ -315,6 +330,9 @@ int main(int argc, char *argv[]) uid_t uid = getuid(); progname = argv[0]; + if (!progname) + exit(2); + if ((p = strrchr(progname, '/')) != NULL) progname = p+1; @@ -326,12 +344,7 @@ int main(int argc, char *argv[]) exit(nfsumount(argc, argv) ? 0 : 1); } - if ((argc < 2)) { - mount_usage(); - exit(1); - } - - if(argv[1][0] == '-') { + if(argv[1] && argv[1][0] == '-') { if(argv[1][1] == 'V') printf("%s ("PACKAGE_STRING")\n", progname); else @@ -339,6 +352,15 @@ int main(int argc, char *argv[]) return 0; } + if ((argc < 3)) { + mount_usage(); + exit(1); + } + + spec = argv[1]; + mount_point = argv[2]; + + argv[2] = argv[0]; /* so that getopt error messages are correct */ while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:hs", longopts, NULL)) != -1) { switch (c) { @@ -346,7 +368,15 @@ int main(int argc, char *argv[]) flags |= MS_RDONLY; break; case 't': - nfs_mount_vers = (strncmp(optarg, "nfs4", 4)) ? 0 : 4; + if (strcmp(optarg, "nfs4") == 0) + nfs_mount_vers = 4; + else if (strcmp(optarg, "nfs") == 0) + nfs_mount_vers = 0; + else { + fprintf(stderr, "%s: unknown filesystem type: %s\n", + progname, optarg); + exit(1); + } break; case 'v': ++verbose; @@ -399,27 +429,45 @@ int main(int argc, char *argv[]) exit(1); } } + if (optind != argc-2) { + /* Extra non-option words at the end... */ + mount_usage(); + exit(1); + } - spec = argv[1]; - mount_point = argv[2]; + if (strcmp(progname, "mount.nfs4") == 0) + nfs_mount_vers = 4; if (uid != 0) { /* don't even think about it unless options exactly - * make fstab + * match fstab */ struct mntentchn *mc; if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || - strcmp(mc->m.mnt_opts, mount_opts) != 0) { + strcmp(mc->m.mnt_type, (nfs_mount_vers == 4 ? "nfs4":"nfs")) != 0 + ) { fprintf(stderr, "%s: permission died - no match for fstab\n", progname); exit(1); } + /* 'mount' munges the options from fstab before passing them + * to us, so it is non-trivial to test that we have the correct + * set of options and we don't want to trust what the user + * gave us, so just take whatever is in fstab + */ + mount_opts = strdup(mc->m.mnt_opts); mounttype = 0; } mount_point = canonicalize(mount_point); + if (mount_point == NULL || + mount_point[0] != '/') { + fprintf(stderr, "%s: unknown mount point %s\n", + progname, mount_point ? : ""); + exit(1); + } parse_opts(mount_opts, &flags, &extra_opts); @@ -430,11 +478,9 @@ int main(int argc, char *argv[]) } } - if (!strcmp(progname, "mount.nfs4") || nfs_mount_vers == 4) { - nfs_mount_vers = 4; + if (nfs_mount_vers == 4) mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); - } - else if (!strcmp(progname, "mount.nfs")) { + else { int need_statd = 0; mnt_err = nfsmount(spec, mount_point, &flags, &extra_opts, &mount_opts, @@ -443,18 +489,19 @@ int main(int argc, char *argv[]) start_statd(); } - if (fake) - return 0; if (mnt_err) exit(EX_FAIL); - mnt_err = do_mount_syscall(spec, mount_point, - nfs_mount_vers == 4 ? "nfs4" : "nfs", - flags, mount_opts); - - if (mnt_err) { - mount_error(mount_point); - exit(EX_FAIL); + if (!fake) { + mnt_err = do_mount_syscall(spec, mount_point, + nfs_mount_vers == 4 ? "nfs4" : "nfs", + flags & ~(MS_USER|MS_USERS) , + mount_opts); + + if (mnt_err) { + mount_error(mount_point); + exit(EX_FAIL); + } } if (!nomtab)