From d70bea17c3e6ef2ad5bd61b5e2c231f805d69e6e Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Mon, 16 Jul 2007 16:29:32 -0400 Subject: [PATCH] mount.nfs: White space clean up Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- utils/mount/mount.c | 56 +++++++++++++++++++++-------------- utils/mount/mount_constants.h | 1 - utils/mount/nfs4mount.c | 6 ++-- utils/mount/nfsmount.c | 10 +++---- utils/mount/nfsumount.c | 1 - 5 files changed, 42 insertions(+), 32 deletions(-) diff --git a/utils/mount/mount.c b/utils/mount/mount.c index d5e5cea..7a4912e 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; @@ -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; } @@ -425,8 +435,11 @@ int main(int argc, char *argv[]) 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(EX_USAGE); } @@ -505,4 +518,3 @@ out: free(mount_point); exit(mnt_err); } - diff --git a/utils/mount/mount_constants.h b/utils/mount/mount_constants.h index ff7b3bc..7c972da 100644 --- a/utils/mount/mount_constants.h +++ b/utils/mount/mount_constants.h @@ -62,4 +62,3 @@ if we have a stack or plain mount - mount atop of it, forming a stack. */ #endif #endif /* _NFS_MOUNT_CONSTANTS_H */ - diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c index 90d5c1e..26a6896 100644 --- a/utils/mount/nfs4mount.c +++ b/utils/mount/nfs4mount.c @@ -70,7 +70,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd"; if (access(GSSDLCK, F_OK)) { \ printf(_("Warning: rpc.gssd appears not to be running.\n")); \ } \ -} while(0); +} while(0); #ifndef NFS_PORT #define NFS_PORT 2049 @@ -304,9 +304,9 @@ int nfs4mount(const char *spec, const char *node, int flags, val = 0; opt += 2; } - if (!strcmp(opt, "bg")) + if (!strcmp(opt, "bg")) bg = val; - else if (!strcmp(opt, "fg")) + else if (!strcmp(opt, "fg")) bg = !val; else if (!strcmp(opt, "soft")) soft = val; diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c index a59d2c2..6949b50 100644 --- a/utils/mount/nfsmount.c +++ b/utils/mount/nfsmount.c @@ -23,7 +23,7 @@ * * 1999-02-22 Arkadiusz Mi¶kiewicz * - added Native Language Support - * + * * Modified by Olaf Kirch and Trond Myklebust for new NFS code, * plus NFSv3 stuff. * @@ -339,9 +339,9 @@ parse_options(char *old_opts, struct nfs_mount_data *data, val = 0; opt += 2; } - if (!strcmp(opt, "bg")) + if (!strcmp(opt, "bg")) *bg = val; - else if (!strcmp(opt, "fg")) + else if (!strcmp(opt, "fg")) *bg = !val; else if (!strcmp(opt, "soft")) { data->flags &= ~NFS_MOUNT_SOFT; @@ -500,7 +500,7 @@ nfsmount(const char *spec, const char *node, int flags, clnt_addr_t mnt_server = { &mounthost, }; clnt_addr_t nfs_server = { &hostname, }; struct sockaddr_in *nfs_saddr = &nfs_server.saddr; - struct pmap *mnt_pmap = &mnt_server.pmap, + struct pmap *mnt_pmap = &mnt_server.pmap, *nfs_pmap = &nfs_server.pmap; struct pmap save_mnt, save_nfs; @@ -744,7 +744,7 @@ nfsmount(const char *spec, const char *node, int flags, #if NFS_MOUNT_VERSION >= 5 mountres = &mntres.nfsv3.mountres3_u.mountinfo; i = mountres->auth_flavors.auth_flavors_len; - if (i <= 0) + if (i <= 0) goto noauth_flavors; flavor = mountres->auth_flavors.auth_flavors_val; diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index b6a87f2..303b485 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -355,4 +355,3 @@ int nfsumount(int argc, char *argv[]) return ret; } - -- 2.39.5