implemented POPT_ARGINFO_INC_DATA

svn path=/trunk/; revision=456

1 files changed, 9 insertions, 4 deletions

diff --git a/support/popt.c b/support/popt.c
index 47f0d008..9ebc81bb 100644
--- a/support/popt.c
+++ b/support/popt.c
@@ -242,7 +242,11 @@ static const struct poptOption * findOption(const struct poptOption * table,
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    opt2 = findOption(opt->arg, longName, shortName, callback, 
 			      callbackData, singleDash);
-	    if (opt2) return opt2;
+	    if (opt2) {
+		if (*callback && !*callbackData)
+		    *callbackData = opt->descrip;
+		return opt2;
+	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName && 
@@ -256,11 +260,12 @@ static const struct poptOption * findOption(const struct poptOption * table,
     }
 
     if (!opt->longName && !opt->shortName) return NULL;
+    *callbackData = NULL;
+    *callback = NULL;
     if (cb) {
 	*callback = cb->arg;
-	*callbackData = cb->descrip;
-    } else {
-	*callback = NULL;
+	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA))
+	    *callbackData = cb->descrip;
     }
 
     return opt;