Wed Apr 24 16:56:48 2002 Michael Jennings (mej)
Fixed bug where initial options would get parsed even if they were part of a -e/--exec expression. SVN revision: 6174
This commit is contained in:
parent
e23c811747
commit
306487a72e
|
@ -4584,3 +4584,8 @@ Redraw the buttonbar properly when moved. Spotted by Azundris
|
||||||
|
|
||||||
Also fixed the display of underlining with fonts lacking descent.
|
Also fixed the display of underlining with fonts lacking descent.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Wed Apr 24 16:56:48 2002 Michael Jennings (mej)
|
||||||
|
|
||||||
|
Fixed bug where initial options would get parsed even if they were
|
||||||
|
part of a -e/--exec expression.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -1055,6 +1055,7 @@ get_initial_options(int argc, char *argv[])
|
||||||
D_OPTIONS(("argv[%d] == \"%s\"\n", i, argv[i]));
|
D_OPTIONS(("argv[%d] == \"%s\"\n", i, argv[i]));
|
||||||
|
|
||||||
if (*opt != '-') {
|
if (*opt != '-') {
|
||||||
|
D_OPTIONS(("Non-option detected.\n"));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (*(opt + 1) == '-') {
|
if (*(opt + 1) == '-') {
|
||||||
|
@ -1074,6 +1075,7 @@ get_initial_options(int argc, char *argv[])
|
||||||
} else if (!BEG_STRCASECMP(opt, "install")) {
|
} else if (!BEG_STRCASECMP(opt, "install")) {
|
||||||
j = 4;
|
j = 4;
|
||||||
} else if (!BEG_STRCASECMP(opt, "exec") && (*(opt+4) != '=')) {
|
} else if (!BEG_STRCASECMP(opt, "exec") && (*(opt+4) != '=')) {
|
||||||
|
i = (unsigned long) argc;
|
||||||
break;
|
break;
|
||||||
} else
|
} else
|
||||||
continue;
|
continue;
|
||||||
|
@ -1127,6 +1129,7 @@ get_initial_options(int argc, char *argv[])
|
||||||
register unsigned short pos;
|
register unsigned short pos;
|
||||||
unsigned char done = 0;
|
unsigned char done = 0;
|
||||||
|
|
||||||
|
D_OPTIONS(("Short option detected.\n"));
|
||||||
for (pos = 1; opt[pos] && !done; pos++) {
|
for (pos = 1; opt[pos] && !done; pos++) {
|
||||||
if (opt[pos] == 't') {
|
if (opt[pos] == 't') {
|
||||||
j = 0;
|
j = 0;
|
||||||
|
@ -1135,9 +1138,11 @@ get_initial_options(int argc, char *argv[])
|
||||||
} else if (opt[pos] == 'd') {
|
} else if (opt[pos] == 'd') {
|
||||||
j = 2;
|
j = 2;
|
||||||
} else if (opt[pos] == 'e') {
|
} else if (opt[pos] == 'e') {
|
||||||
|
i = (unsigned long) argc;
|
||||||
break;
|
break;
|
||||||
} else
|
} else {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (opt[pos + 1]) {
|
if (opt[pos + 1]) {
|
||||||
val_ptr = opt + pos + 1;
|
val_ptr = opt + pos + 1;
|
||||||
|
|
Loading…
Reference in New Issue