nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

makedefs -q fix

Browse Source 
Make the input buffer for quest messages bigger so that the expanded
header line from nhsub won't be too long.  Also, makedefs will notice
and report too long lines ('makedefs -q' only) and sanely proceed with
the rest of the file instead of treating the excess part of a long
line as a separate line.
This commit is contained in:
PatR
2015-05-23 23:11:41 -07:00
parent 7bc1a6e7f3
commit 5f0a55f2cd
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/qtext.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 qtext.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 qtext.h $NHDT-Date: 1432447889 2015/05/24 06:11:29 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */
/* NetHack 3.6 qtext.h $Date: 2009/05/06 10:45:02 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)qtext.h 3.5 1997/02/02 */
/* Copyright (c) Mike Stephenson 1991. */
@@ -12,8 +12,9 @@
#define LEN_HDR 3 /* Maximum length of a category name */
/* quest text message buffer sizes; used to be hardcoded as 80 and 128, but
have been expanded to allow some slop for block message summary lines */
#define QTEXT_IN_SIZ 100 /* used by both nethack and makedefs */
have been expanded to allow some slop for block message summary lines
and for source repository header lines */
#define QTEXT_IN_SIZ 150 /* used by both nethack and makedefs */
#define QTEXT_OUTSIZ 200 /* used only by nethack */
struct qtmsg {
@@ -50,7 +51,7 @@ struct qthdr {
#define TEXT_TRUNC "Text record truncated at line %d\n"
#define OUT_OF_HEADERS "Too many message types (line %d)\nAdjust N_HDR in qtext.h and recompile.\n"
#define OUT_OF_MESSAGES "Too many messages in class (line %d)\nAdjust N_MSG in qtext.h and recompile.\n"
#define QLINE_TOO_LONG "Line %d too long; truncated\n"
#else /***** !MAKEDEFS *****/

10
util/makedefs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 makedefs.c $NHDT-Date: 1431192769 2015/05/09 17:32:49 $ $NHDT-Branch: master $:$NHDT-Revision: 1.93 $ */
/* NetHack 3.6 makedefs.c $NHDT-Date: 1432447897 2015/05/24 06:11:37 $ $NHDT-Branch: master $:$NHDT-Revision: 1.94 $ */
/* NetHack 3.6 makedefs.c $Date: 2012/01/15 09:27:03 $ $Revision: 1.50 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) M. Stephenson, 1990, 1991. */
@@ -2393,6 +2393,14 @@ do_questtxt()
SpinCursor(3);
qt_line++;
if (!index(in_line, '\n')) {
/* no newline; line is longer than QTEXT_IN_SIZ-1 */
int c;
Fprintf(stderr, QLINE_TOO_LONG, qt_line);
/* discard the rest of the current input line */
do { c = fgetc(ifp); } while (c != '\n' && c != EOF);
}
if (qt_control(in_line))
do_qt_control(in_line);
else if (qt_comment(in_line))