XFree86 3.9Ab - xterm patch #59 - 1998/1/5 - T.Dickey My last patch has an off-by-one error in the comparison for argc. Douglas Kosovic showed me where (he got a core dump). Also, I think this explains Clint Olsen's problem, but the symptoms were more subtle (EINVAL for a system call if the -display option is omitted). -------------------------------------------------------------------------------- Makefile.in | 2 ++ main.c | 2 +- os2main.c | 2 +- version.h | 2 +- 4 files changed, 5 insertions, 3 deletions -------------------------------------------------------------------------------- Index: Makefile.in --- xterm-58+/Makefile.in Sat Jan 3 08:25:35 1998 +++ xterm-59/Makefile.in Mon Jan 5 06:32:01 1998 @@ -69,6 +69,8 @@ @RULE_CC@ @ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@ +main.o: version.h + xterm : $(OBJS1) $(LINK) $(LDFLAGS) -o $@ $(OBJS1) $(X_LIBS) $(LIBS) Index: main.c --- xterm-58+/main.c Sat Jan 3 09:55:44 1998 +++ xterm-59/main.c Mon Jan 5 06:25:52 1998 @@ -1108,7 +1108,7 @@ /* Do these first, since we may not be able to open the display */ ProgramName = argv[0]; - if (argc >= 1) { + if (argc > 1) { if (!strncmp(argv[1], "-v", 2)) Version(); if (!strncmp(argv[1], "-h", 2)) Index: os2main.c --- xterm-58+/os2main.c Sat Jan 3 09:53:03 1998 +++ xterm-59/os2main.c Mon Jan 5 06:25:52 1998 @@ -765,7 +765,7 @@ /* Do these first, since we may not be able to open the display */ ProgramName = argv[0]; - if (argc >= 1) { + if (argc > 1) { if (!strncmp(argv[1], "-v", 2)) Version(); if (!strncmp(argv[1], "-h", 2)) Index: version.h --- xterm-58+/version.h Sat Jan 3 08:55:47 1998 +++ xterm-59/version.h Mon Jan 5 06:31:14 1998 @@ -4,4 +4,4 @@ * version of xterm has been built. The number in parentheses is my patch * number (T.Dickey). */ -#define XTERM_VERSION "XFree86 3.9Ab(58)" +#define XTERM_VERSION "XFree86 3.9Ab(59)"