Attachment 4975 Details for Bug 6915 – Better patch (catch --quiet)

[patch] Better patch (catch --quiet)

popt-unwanted-arg-rsync.v2.diff (text/plain), 1.93 KB, created by Matt McCutchen on 2009-11-20 21:57:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt McCutchen

Created: 2009-11-20 21:57:23 UTC

Size: 1.93 KB

patch

obsolete

>diff --git a/popt/popt.c b/popt/popt.c
>index a01b6b9..bbe97e2 100644
>--- a/popt/popt.c
>+++ b/popt/popt.c
>@@ -865,15 +865,17 @@ int poptGetNextOpt(poptContext con)
> 	/*@=branchstate@*/
> 
> 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
>-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
>-	    if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L))
>-		return POPT_ERROR_BADOPERATION;
>-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
>+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE ||
>+	    (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
>+	    if (longArg)
>+		return POPT_ERROR_UNWANTEDARG;
> 	    if (opt->arg) {
>-		if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val))
>+		long val = ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE)
>+			? 1L : (long)opt->val;
>+		if (poptSaveInt((int *)opt->arg, opt->argInfo, val))
> 		    return POPT_ERROR_BADOPERATION;
> 	    }
>-	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
>+	} else {
> 	    con->os->nextArg = _free(con->os->nextArg);
> 	    /*@-usedef@*/	/* FIX: W2DO? */
> 	    if (longArg) {
>@@ -1202,6 +1204,8 @@ const char * poptStrerror(const int error)
>     switch (error) {
>       case POPT_ERROR_NOARG:
> 	return POPT_("missing argument");
>+      case POPT_ERROR_UNWANTEDARG:
>+	return POPT_("option does not take an argument");
>       case POPT_ERROR_BADOPT:
> 	return POPT_("unknown option");
>       case POPT_ERROR_BADOPERATION:
>diff --git a/popt/popt.h b/popt/popt.h
>index 4f85d9e..8d85f73 100644
>--- a/popt/popt.h
>+++ b/popt/popt.h
>@@ -82,6 +82,7 @@
> /*@{*/
> #define POPT_ERROR_NOARG	-10	/*!< missing argument */
> #define POPT_ERROR_BADOPT	-11	/*!< unknown option */
>+#define POPT_ERROR_UNWANTEDARG	-12	/*!< option does not take an argument */
> #define POPT_ERROR_OPTSTOODEEP	-13	/*!< aliases nested too deeply */
> #define POPT_ERROR_BADQUOTE	-15	/*!< error in paramter quoting */
> #define POPT_ERROR_ERRNO	-16	/*!< errno set, use strerror(errno) */

Actions: View

Attachments on bug 6915: 4974 | 4975