* [PATCH] nfs-util: Update exportfs flush option list in usage message.
@ 2012-06-30 6:23 Namjae Jeon
2012-07-05 19:38 ` Steve Dickson
0 siblings, 1 reply; 2+ messages in thread
From: Namjae Jeon @ 2012-06-30 6:23 UTC (permalink / raw)
To: bfields, Trond.Myklebust
Cc: linux-nfs, linux-kernel, Namjae Jeon, Amit Sahrawat
Update exportfs flush option list in usage message.
And I sort these cases in alphabetical order.
Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: Amit Sahrawat <amit.sahrawat83@gmail.com>
---
utils/exportfs/exportfs.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index a3323d7..9f79541 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -40,7 +40,7 @@ static void unexportfs(char *arg, int verbose);
static void exports_update(int verbose);
static void dump(int verbose);
static void error(nfs_export *exp, int err);
-static void usage(const char *progname);
+static void usage(const char *progname, int n);
static void validate_export(nfs_export *exp);
static int matchhostname(const char *hostname1, const char *hostname2);
static void export_d_read(const char *dname);
@@ -105,11 +105,17 @@ main(int argc, char **argv)
export_errno = 0;
- while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) {
+ while ((c = getopt(argc, argv, "afhio:ruv")) != EOF) {
switch(c) {
case 'a':
f_all = 1;
break;
+ case 'f':
+ force_flush = 1;
+ break;
+ case 'h':
+ usage(progname, 0);
+ break;
case 'i':
f_ignore = 1;
break;
@@ -126,11 +132,8 @@ main(int argc, char **argv)
case 'v':
f_verbose = 1;
break;
- case 'f':
- force_flush = 1;
- break;
default:
- usage(progname);
+ usage(progname, 1);
break;
}
}
@@ -723,8 +726,8 @@ error(nfs_export *exp, int err)
}
static void
-usage(const char *progname)
+usage(const char *progname, int n)
{
- fprintf(stderr, "usage: %s [-aruv] [host:/path]\n", progname);
- exit(1);
+ fprintf(stderr, "usage: %s [-afhioruv] [host:/path]\n", progname);
+ exit(n);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nfs-util: Update exportfs flush option list in usage message.
2012-06-30 6:23 [PATCH] nfs-util: Update exportfs flush option list in usage message Namjae Jeon
@ 2012-07-05 19:38 ` Steve Dickson
0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2012-07-05 19:38 UTC (permalink / raw)
To: Namjae Jeon
Cc: bfields, Trond.Myklebust, linux-nfs, linux-kernel, Amit Sahrawat
On 06/30/2012 02:23 AM, Namjae Jeon wrote:
> Update exportfs flush option list in usage message.
> And I sort these cases in alphabetical order.
>
> Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
> Signed-off-by: Amit Sahrawat <amit.sahrawat83@gmail.com>
Committed...
steved.
> ---
> utils/exportfs/exportfs.c | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index a3323d7..9f79541 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -40,7 +40,7 @@ static void unexportfs(char *arg, int verbose);
> static void exports_update(int verbose);
> static void dump(int verbose);
> static void error(nfs_export *exp, int err);
> -static void usage(const char *progname);
> +static void usage(const char *progname, int n);
> static void validate_export(nfs_export *exp);
> static int matchhostname(const char *hostname1, const char *hostname2);
> static void export_d_read(const char *dname);
> @@ -105,11 +105,17 @@ main(int argc, char **argv)
>
> export_errno = 0;
>
> - while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) {
> + while ((c = getopt(argc, argv, "afhio:ruv")) != EOF) {
> switch(c) {
> case 'a':
> f_all = 1;
> break;
> + case 'f':
> + force_flush = 1;
> + break;
> + case 'h':
> + usage(progname, 0);
> + break;
> case 'i':
> f_ignore = 1;
> break;
> @@ -126,11 +132,8 @@ main(int argc, char **argv)
> case 'v':
> f_verbose = 1;
> break;
> - case 'f':
> - force_flush = 1;
> - break;
> default:
> - usage(progname);
> + usage(progname, 1);
> break;
> }
> }
> @@ -723,8 +726,8 @@ error(nfs_export *exp, int err)
> }
>
> static void
> -usage(const char *progname)
> +usage(const char *progname, int n)
> {
> - fprintf(stderr, "usage: %s [-aruv] [host:/path]\n", progname);
> - exit(1);
> + fprintf(stderr, "usage: %s [-afhioruv] [host:/path]\n", progname);
> + exit(n);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-05 19:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-30 6:23 [PATCH] nfs-util: Update exportfs flush option list in usage message Namjae Jeon
2012-07-05 19:38 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox