| 1 |
--- rpm-4.0.4/popt/popt.c~ Sat Jan 19 07:28:30 2002 |
| 2 |
+++ rpm-4.0.4/popt/popt.c Fri Aug 9 17:08:15 2002 |
| 3 |
@@ -840,12 +840,17 @@ |
| 4 |
canstrip) { |
| 5 |
poptStripArg(con, con->os->next); |
| 6 |
} |
| 7 |
- |
| 8 |
+ |
| 9 |
if (con->os->argv != NULL) { /* XXX can't happen */ |
| 10 |
- /* XXX watchout: subtle side-effects live here. */ |
| 11 |
- longArg = con->os->argv[con->os->next++]; |
| 12 |
- longArg = expandNextArg(con, longArg); |
| 13 |
- con->os->nextArg = longArg; |
| 14 |
+ if (opt->argInfo & POPT_ARGFLAG_OPTIONAL && |
| 15 |
+ con->os->argv[con->os->next][0] == '-') { |
| 16 |
+ con->os->nextArg = NULL; |
| 17 |
+ } else { |
| 18 |
+ /* XXX watchout: subtle side-effects live here. */ |
| 19 |
+ longArg = con->os->argv[con->os->next++]; |
| 20 |
+ longArg = expandNextArg(con, longArg); |
| 21 |
+ con->os->nextArg = longArg; |
| 22 |
+ } |
| 23 |
} |
| 24 |
} |
| 25 |
} |