- (popt): add POPT_ARGFLAG_OPTIONAL for long options with optional arg.

- (popt): diddle auto-help to include type of arg expected.

CVS patchset: 4394
CVS date: 2000/12/31 20:30:37

1 files changed, 6 insertions, 0 deletions

diff --git a/popt/test1.c b/popt/test1.c
index 5b6aeb723..7b7f55fe0 100644
--- a/popt/test1.c
+++ b/popt/test1.c
@@ -19,6 +19,7 @@ int inc = 0;
 int shortopt = 0;
 float aFloat = 0.0;
 double aDouble = 0.0;
+char * oStr = (char *)-1;
 int singleDash = 0;
 
 static struct poptOption moreCallbackArgs[] = {
@@ -54,6 +55,9 @@ static struct poptOption options[] = {
 	    "A float argument", "FLOAT" },
 	{ "double", 'd', POPT_ARG_DOUBLE, &aDouble, 0,
 	    "A double argument", "DOUBLE" },
+	{ "ostr", '\0', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &oStr, 0,
+	    "An optional str", "ARG" },
+
 	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
@@ -128,6 +132,8 @@ int main(int argc, const char ** argv) {
 	fprintf(stdout, " aFloat: %g", aFloat);
     if (aDouble != 0.0)
 	fprintf(stdout, " aDouble: %g", aDouble);
+    if (oStr != (char *)-1)
+	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
     if (singleDash)
 	fprintf(stdout, " -");