Patchwork cifs.upcall: switch to getopt_long

login
register
mail settings
Submitter Jeff Layton
Date Aug. 19, 2009, 5:28 p.m.
Message ID <1250702925-3583-1-git-send-email-jlayton@redhat.com>
Download mbox | patch
Permalink /patch/31662/
State New
Headers show

Comments

Jeff Layton - Aug. 19, 2009, 5:28 p.m.
...to allow long option names.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 client/cifs.upcall.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Jeff Layton - Aug. 26, 2009, 10:28 a.m.
On Wed, 19 Aug 2009 13:28:45 -0400
Jeff Layton <jlayton@redhat.com> wrote:

> ...to allow long option names.
> 
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
>  client/cifs.upcall.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 

Pushed to samba master branch.
Simo Sorce - Aug. 26, 2009, 12:01 p.m.
On Wed, 2009-08-26 at 06:28 -0400, Jeff Layton wrote:
> On Wed, 19 Aug 2009 13:28:45 -0400
> Jeff Layton <jlayton@redhat.com> wrote:
> 
> > ...to allow long option names.
> > 
> > Signed-off-by: Jeff Layton <jlayton@redhat.com>
> > ---
> >  client/cifs.upcall.c |    8 +++++++-
> >  1 files changed, 7 insertions(+), 1 deletions(-)
> > 
> 
> Pushed to samba master branch.


Good job!

Simo.

Patch

diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index c89df9c..f06d563 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -27,6 +27,7 @@  create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 
 #include "includes.h"
 #include <keyutils.h>
+#include <getopt.h>
 
 #include "cifs_spnego.h"
 
@@ -357,6 +358,11 @@  usage(void)
 	fprintf(stderr, "Usage: %s [-v] key_serial\n", prog);
 }
 
+const struct option long_options[] = {
+	{ "version",	0, NULL, 'v' },
+	{ NULL,		0, NULL, 0 }
+};
+
 int main(const int argc, char *const argv[])
 {
 	struct cifs_spnego_msg *keydata = NULL;
@@ -374,7 +380,7 @@  int main(const int argc, char *const argv[])
 
 	openlog(prog, 0, LOG_DAEMON);
 
-	while ((c = getopt(argc, argv, "cv")) != -1) {
+	while ((c = getopt_long(argc, argv, "cv", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			/* legacy option -- skip it */