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

Sun Sep 29 21:48:10 2002 Michael Jennings (mej) 

Fixed Debian Bug #155960.  WM_COMMAND was being set improperly because
equals signs in the arg list were being NUL'd out for no reason.


SVN revision: 6399
This commit is contained in:
Michael Jennings 2002-09-30 01:49:20 +00:00
parent 47841ac519
commit dc6687b670
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4794,3 +4794,8 @@ Sun Sep 22 00:34:42 2002 Michael Jennings (mej)
Added an option to disable the secondary screen as requested by Marc
Merlin <marc@merlins.org>.
----------------------------------------------------------------------
Sun Sep 29 21:48:10 2002 Michael Jennings (mej)
Fixed Debian Bug #155960. WM_COMMAND was being set improperly because
equals signs in the arg list were being NUL'd out for no reason.
----------------------------------------------------------------------

10
src/options.c
View File

@ -856,7 +856,6 @@ get_options(int argc, char *argv[])
#endif
if ((val_ptr = strchr(opt, '=')) != NULL) {
*val_ptr = 0;
val_ptr++;
hasequal = 1;
} else {
@ -875,7 +874,7 @@ get_options(int argc, char *argv[])
CHECK_BAD();
continue;
}
if (!strcasecmp(opt, "exec")) {
if (!BEG_STRCASECMP(opt, "exec")) {
D_OPTIONS(("--exec option detected\n"));
if (!hasequal) {
@ -902,11 +901,11 @@ get_options(int argc, char *argv[])
}
rs_exec_args[k] = (char *) NULL;
}
} else if (!strcasecmp(opt, "help")) {
} else if (!BEG_STRCASECMP(opt, "help")) {
usage();
} else if (!strcasecmp(opt, "version")) {
} else if (!BEG_STRCASECMP(opt, "version")) {
version();
} else if (!strcasecmp(opt, "attribute")) {
} else if (!BEG_STRCASECMP(opt, "attribute")) {
conf_parse_line(NULL, val_ptr);
} else { /* It's not --exec */
if (optList[j].flag & OPT_BOOLEAN) { /* Boolean value */
@ -1083,7 +1082,6 @@ get_initial_options(int argc, char *argv[])
continue;
if ((val_ptr = strchr(opt, '=')) != NULL) {
*val_ptr = 0;
val_ptr++;
hasequal = 1;
} else {