0:0308e765f136 | 1:7a886f64a4be |
---|---|
1 Index: popt.c | 1 Index: popt.c |
2 --- popt.c.orig 2009-04-12 20:14:38.000000000 +0200 | 2 --- popt.c.orig 2009-04-12 20:14:38.000000000 +0200 |
3 +++ popt.c 2010-04-30 21:31:41.000000000 +0200 | 3 +++ popt.c 2010-04-30 21:31:41.000000000 +0200 |
4 @@ -520,6 +520,11 @@ | 4 @@ -519,6 +519,11 @@ |
5 } | 5 } |
6 | 6 |
7 if (con->leftovers != NULL && con->numLeftovers > 0) { | 7 if (con->leftovers != NULL && con->numLeftovers > 0) { |
8 +#if defined(OPENPKG) | 8 +#if defined(OPENPKG) |
9 + /* Revert back to the old behaviour of passing to "exec" programs an | 9 + /* Revert back to the old behaviour of passing to "exec" programs an |
11 + argv[argc++] = "--"; | 11 + argv[argc++] = "--"; |
12 +#endif | 12 +#endif |
13 memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers); | 13 memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers); |
14 argc += con->numLeftovers; | 14 argc += con->numLeftovers; |
15 } | 15 } |
16 @@ -697,10 +702,19 @@ | 16 @@ -709,10 +709,19 @@ |
17 /*@switchbreak@*/ break; | 17 /*@switchbreak@*/ break; |
18 #endif | 18 #endif |
19 case '!': | 19 case '!': |
20 +#if defined(OPENPKG) | 20 +#if defined(OPENPKG) |
21 + /* allow standard "!#:+" (first argument is expanded multiple times) | 21 + /* allow standard "!#:+" (first argument is expanded multiple times) |