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

USE_OLDARGS update (3 of 2 :-)

Browse Source 
Handle the few variadic calls in pline.c a better way.
This commit is contained in:
PatR
2017-08-03 16:31:55 -07:00
parent 3b675c5b49
commit b90c5d5c4f
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/pline.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pline.c $NHDT-Date: 1501725406 2017/08/03 01:56:46 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.60 $ */
/* NetHack 3.6 pline.c $NHDT-Date: 1501803108 2017/08/03 23:31:48 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.61 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -435,18 +435,8 @@ VA_DECL(const char *, s)
Vsprintf(pbuf, s, VA_ARGS);
pbuf[BUFSZ - 1] = '\0'; /* sanity */
paniclog("impossible", pbuf);
#ifndef USE_OLDARGS
#define DUMMY_PLINE_ARGS /*empty*/
#else /* needed because we follow the definition of pline() itself;
* passing 1 arg, pline takes 9 (for USE_OLDARGS) so add 8 dummies */
#define DUMMY_PLINE_ARGS , (vA) 0, (vA) 0, (vA) 0, (vA) 0, \
(vA) 0, (vA) 0, (vA) 0, (vA) 0
#endif
pline("%s", pbuf /* no comma here; when needed, it's in DUMMY_ARGS */
DUMMY_PLINE_ARGS);
pline("%s", "Program in disorder - perhaps you'd better #quit."
DUMMY_PLINE_ARGS);
#undef DUMMY_PLINE_ARGS
pline("%s", VA_PASS1(pbuf));
pline("%s", VA_PASS1("Program in disorder - perhaps you'd better #quit."));
program_state.in_impossible = 0;
VA_END();
}
@@ -478,16 +468,16 @@ const char *line;
(void) setuid(getuid());
(void) execv(args[0], (char *const *) args);
perror((char *) 0);
(void) fprintf(stderr, "Exec to message handler %s failed.\n",
env);
(void) fprintf(stderr, "Exec to message handler %s failed.\n", env);
terminate(EXIT_FAILURE);
} else if (f > 0) {
int status;
waitpid(f, &status, 0);
} else if (f == -1) {
perror((char *) 0);
use_pline_handler = FALSE;
pline("Fork to message handler failed.");
pline("%s", VA_PASS1("Fork to message handler failed."));
}
}
#endif /* defined(POSIX_TYPES) || defined(__GNUC__) */