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:
parent
47841ac519
commit
dc6687b670
|
@ -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
|
Added an option to disable the secondary screen as requested by Marc
|
||||||
Merlin <marc@merlins.org>.
|
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.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -856,7 +856,6 @@ get_options(int argc, char *argv[])
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((val_ptr = strchr(opt, '=')) != NULL) {
|
if ((val_ptr = strchr(opt, '=')) != NULL) {
|
||||||
*val_ptr = 0;
|
|
||||||
val_ptr++;
|
val_ptr++;
|
||||||
hasequal = 1;
|
hasequal = 1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -875,7 +874,7 @@ get_options(int argc, char *argv[])
|
||||||
CHECK_BAD();
|
CHECK_BAD();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcasecmp(opt, "exec")) {
|
if (!BEG_STRCASECMP(opt, "exec")) {
|
||||||
D_OPTIONS(("--exec option detected\n"));
|
D_OPTIONS(("--exec option detected\n"));
|
||||||
if (!hasequal) {
|
if (!hasequal) {
|
||||||
|
|
||||||
|
@ -902,11 +901,11 @@ get_options(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
rs_exec_args[k] = (char *) NULL;
|
rs_exec_args[k] = (char *) NULL;
|
||||||
}
|
}
|
||||||
} else if (!strcasecmp(opt, "help")) {
|
} else if (!BEG_STRCASECMP(opt, "help")) {
|
||||||
usage();
|
usage();
|
||||||
} else if (!strcasecmp(opt, "version")) {
|
} else if (!BEG_STRCASECMP(opt, "version")) {
|
||||||
version();
|
version();
|
||||||
} else if (!strcasecmp(opt, "attribute")) {
|
} else if (!BEG_STRCASECMP(opt, "attribute")) {
|
||||||
conf_parse_line(NULL, val_ptr);
|
conf_parse_line(NULL, val_ptr);
|
||||||
} else { /* It's not --exec */
|
} else { /* It's not --exec */
|
||||||
if (optList[j].flag & OPT_BOOLEAN) { /* Boolean value */
|
if (optList[j].flag & OPT_BOOLEAN) { /* Boolean value */
|
||||||
|
@ -1083,7 +1082,6 @@ get_initial_options(int argc, char *argv[])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ((val_ptr = strchr(opt, '=')) != NULL) {
|
if ((val_ptr = strchr(opt, '=')) != NULL) {
|
||||||
*val_ptr = 0;
|
|
||||||
val_ptr++;
|
val_ptr++;
|
||||||
hasequal = 1;
|
hasequal = 1;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue