From: Michael Johnson <johnsonm@src.gnome.org>
Date: Tue, 1 Dec 1998 19:05:36 +0000 (+0000)
Subject: POPT_ARG_VAL appears to work, now that I have a finished test case...
X-Git-Tag: GNOME_COMMON_1_2_1~238
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3e53b0d517fdff2e8780733f0ea74b6d9aa19f1;p=platform%2Fupstream%2Fgnome-common.git

POPT_ARG_VAL appears to work, now that I have a finished test case...

svn path=/trunk/; revision=493
---

diff --git a/support/popt.c b/support/popt.c
index f9e6153..7dd453d 100644
--- a/support/popt.c
+++ b/support/popt.c
@@ -368,9 +368,11 @@ int poptGetNextOpt(poptContext con) {
 		con->os->nextCharArg = origOptString;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
 	    *((int *)opt->arg) = 1;
-	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
+	    if (opt->arg) *((int *) opt->arg) = opt->val;
+	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (longArg) {
 		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
@@ -392,10 +394,6 @@ int poptGetNextOpt(poptContext con) {
 		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
 
-		  case POPT_ARG_VAL:
-		    *((int *) opt->arg) = opt->val;
-		    break;
-
 		  case POPT_ARG_INT:
 		  case POPT_ARG_LONG:
 		    aLong = strtol(con->os->nextArg, &end, 0);
@@ -440,7 +438,8 @@ int poptGetNextOpt(poptContext con) {
 	else 
 	    sprintf(con->finalArgv[i], "-%c", opt->shortName);
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
+		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) 
 	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
     }