github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-27 04:12:51 +00:00
Code Issues Projects Releases Wiki Activity

Prevent duplicate printing of info lines in response to -info option (#349)

Browse Source 
The X options parser printed the info lines as well as the main options handler.
Add mention of the -info option in the -help usage information.

Fixes Interlisp/medley#41
This commit is contained in:
Nick Briggs
2021-02-12 08:06:43 -08:00
committed by GitHub
parent 6fe94fd655
commit f2ac050e8e
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xrdopt.c
View File

@@ -30,7 +30,6 @@
#include "dbprint.h"
#include "xrdoptdefs.h"
#include "maindefs.h"
XrmDatabase commandlineDB, applicationDB, serverDB, homeDB, rDB;
extern int LispWindowRequestedX, LispWindowRequestedY;
@@ -111,6 +110,7 @@ void print_Xusage(const char *prog)
fprintf(stderr, " %s options:\n", prog);
fprintf(stderr, " [-sysout] [<sysout>] -path to the Medley image\n");
fprintf(stderr, " -h[elp] -prints this text\n");
fprintf(stderr, " -info -prints configuration info\n");
fprintf(stderr, " -d[isplay] <host>:<display>.<screen>\n");
fprintf(stderr,
" -g[eometry] <geom> -size & placement for the medley window on your X "
@@ -163,16 +163,12 @@ void read_Xoption(int *argc, char *argv[])
/**********************************************/
/* */
/* Take care of -help & -info flags, which */
/* aren't handled correctly by the X code. */
/* Take care of -help flag, which */
/* isn't handled correctly by the X code. */
/* */
/**********************************************/
for (i = 1; i < *argc; i++) {
if (argv[i] && ((strcmp(argv[i], "-info") == 0) || (strcmp(argv[i], "-INFO") == 0))) {
print_info_lines();
}
if (argv[i] && ((strcmp(argv[i], "-help") == 0) || (strcmp(argv[i], "-HELP") == 0))) {
print_Xusage(argv[0]);
exit(0);