X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=64a2b75fd68cc949f2e98cc6fb4904b91e497309;hp=dde4562b045d9f60e4e571ea8a35cf1e914a7ac7;hb=a4b10d48a730fbc6ff62197facddccdf7e204610;hpb=8d85f209d0343cf8fef35ea0c94ba9c93af6ffa6 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index dde4562..64a2b75 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -64,12 +64,14 @@ static struct option longopts[] = { { NULL, 0, 0, 0 } }; -/* Map from -o and fstab option strings to the flag argument to mount(2). */ +/* + * Map from -o and fstab option strings to the flag argument to mount(2). + */ struct opt_map { - const char *opt; /* option name */ - int skip; /* skip in mtab option string */ - int inv; /* true if flag value should be inverted */ - int mask; /* flag mask value */ + const char *opt; /* option name */ + int skip; /* skip in mtab option string */ + int inv; /* true if flag value should be inverted */ + int mask; /* flag mask value */ }; static const struct opt_map opt_map[] = { @@ -183,8 +185,11 @@ static void print_one(char *spec, char *node, char *type, char *opts) } } -/* Try to build a canonical options string. */ -static char * fix_opts_string (int flags, const char *extra_opts) { +/* + * Build a canonical mount option string for /etc/mtab. + */ +static char *fix_opts_string(int flags, const char *extra_opts) +{ const struct opt_map *om; char *new_opts; @@ -262,7 +267,7 @@ fail_unlock: return result; } -void mount_usage() +void mount_usage(void) { printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n", progname); @@ -278,8 +283,8 @@ void mount_usage() printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"); } -static inline void -parse_opt(const char *opt, int *mask, char *extra_opts, int len) { +static void parse_opt(const char *opt, int *mask, char *extra_opts, int len) +{ const struct opt_map *om; for (om = opt_map; om->opt != NULL; om++) { @@ -301,30 +306,35 @@ parse_opt(const char *opt, int *mask, char *extra_opts, int len) { strcat(extra_opts, opt); } -/* Take -o options list and compute 4th and 5th args to mount(2). flags - gets the standard options (indicated by bits) and extra_opts all the rest */ -static void parse_opts (const char *options, int *flags, char **extra_opts) +/* + * Convert the provided mount command-line options into the 4th & + * 5th arguments to mount(2). Output parameter "@flags" gets the + * standard options (indicated by MS_ bits), and output parameter + * "@extra_opts" gets all the filesystem-specific options. + */ +static void parse_opts(const char *options, int *flags, char **extra_opts) { if (options != NULL) { char *opts = xstrdup(options); char *opt, *p; - int len = strlen(opts) + 1; /* include room for a null */ + int len = strlen(opts) + 1; /* include room for a null */ int open_quote = 0; *extra_opts = xmalloc(len); **extra_opts = '\0'; - for (p=opts, opt=NULL; p && *p; p++) { + for (p = opts, opt = NULL; p && *p; p++) { if (!opt) - opt = p; /* begin of the option item */ + opt = p; /* begin of the option item */ if (*p == '"') - open_quote ^= 1; /* reverse the status */ + open_quote ^= 1; /* reverse the status */ if (open_quote) - continue; /* still in a quoted block */ + continue; /* still in a quoted block */ if (*p == ',') - *p = '\0'; /* terminate the option item */ + *p = '\0'; /* terminate the option item */ + /* end of option item or last item */ - if (*p == '\0' || *(p+1) == '\0') { + if (*p == '\0' || *(p + 1) == '\0') { parse_opt(opt, flags, *extra_opts, len); opt = NULL; } @@ -364,25 +374,20 @@ int main(int argc, char *argv[]) discover_nfs_mount_data_version(); - if(!strncmp(progname, "umount", strlen("umount"))) { - if(argc < 2) { - umount_usage(); - exit(1); - } + if(!strncmp(progname, "umount", strlen("umount"))) exit(nfsumount(argc, argv)); - } - if(argv[1] && argv[1][0] == '-') { + if (argv[1] && argv[1][0] == '-') { if(argv[1][1] == 'V') printf("%s ("PACKAGE_STRING")\n", progname); else mount_usage(); - return 0; + exit(0); } if ((argc < 3)) { mount_usage(); - exit(1); + exit(EX_USAGE); } spec = argv[1]; @@ -422,13 +427,16 @@ int main(int argc, char *argv[]) case 'h': default: mount_usage(); - exit(1); + exit(EX_USAGE); } } - if (optind != argc-2) { - /* Extra non-option words at the end... */ + + /* + * Extra non-option words at the end are bogus... + */ + if (optind != argc - 2) { mount_usage(); - exit(1); + exit(EX_USAGE); } if (strcmp(progname, "mount.nfs4") == 0) @@ -445,9 +453,9 @@ int main(int argc, char *argv[]) if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || strcmp(mc->m.mnt_type, fs_type) != 0) { - fprintf(stderr, "%s: permission denied: no match for %s " - "found in /etc/fstab\n", progname, mount_point); - exit(1); + nfs_error(_("%s: permission denied: no match for %s " + "found in /etc/fstab"), progname, mount_point); + exit(EX_USAGE); } /* @@ -460,24 +468,31 @@ int main(int argc, char *argv[]) } 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); + if (!mount_point) { + nfs_error(_("%s: no mount point provided"), progname); + exit(EX_USAGE); } - + if (mount_point[0] != '/') { + nfs_error(_("%s: unrecognized mount point %s"), + progname, mount_point); + mnt_err = EX_USAGE; + goto out; + } + parse_opts(mount_opts, &flags, &extra_opts); if (uid != 0) { - if (! (flags & (MS_USERS | MS_USER))) { - fprintf(stderr, "%s: permission denied\n", progname); - exit(1); - } + if (!(flags & (MS_USERS|MS_USER))) { + nfs_error(_("%s: permission denied"), progname); + mnt_err = EX_USAGE; + goto out; + } } - if (chk_mountpoint(mount_point)) - exit(EX_FAIL); + if (chk_mountpoint(mount_point)) { + mnt_err = EX_USAGE; + goto out; + } if (strcmp(fs_type, "nfs4") == 0) mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake); @@ -494,6 +509,7 @@ int main(int argc, char *argv[]) mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts, 0, 0 /* these are always zero for NFS */ ); +out: + free(mount_point); exit(mnt_err); } -