old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Michael Jennings 2002-04-24 20:58:00 +00:00
parent e23c811747
commit 306487a72e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4584,3 +4584,8 @@ Redraw the buttonbar properly when moved. Spotted by Azundris
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.
----------------------------------------------------------------------

7
src/options.c
View File

@ -1055,6 +1055,7 @@ get_initial_options(int argc, char *argv[])
D_OPTIONS(("argv[%d] == \"%s\"\n", i, argv[i]));
if (*opt != '-') {
D_OPTIONS(("Non-option detected.\n"));
continue;
}
if (*(opt + 1) == '-') {
@ -1074,6 +1075,7 @@ get_initial_options(int argc, char *argv[])
} else if (!BEG_STRCASECMP(opt, "install")) {
j = 4;
} else if (!BEG_STRCASECMP(opt, "exec") && (*(opt+4) != '=')) {
i = (unsigned long) argc;
break;
} else
continue;
@ -1127,6 +1129,7 @@ get_initial_options(int argc, char *argv[])
register unsigned short pos;
unsigned char done = 0;
D_OPTIONS(("Short option detected.\n"));
for (pos = 1; opt[pos] && !done; pos++) {
if (opt[pos] == 't') {
j = 0;
@ -1135,9 +1138,11 @@ get_initial_options(int argc, char *argv[])
} else if (opt[pos] == 'd') {
j = 2;
} else if (opt[pos] == 'e') {
i = (unsigned long) argc;
break;
} else
} else {
continue;
}
if (opt[pos + 1]) {
val_ptr = opt + pos + 1;