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

fix Unix build with DEF_PAGER defined

Browse Source 
Eliminate a couple of compile warnings produced when DEF_PAGER is
defined:  unixmain.c: g.catmore=DEF_PAGER; wintty.c: fd=open(...).

Override its use when DLB is also defined since an external pager
could access 'license' but not 'history', 'opthelp', &c when those
are in the dlb container file.

In the commented out value for DEF_PAGER, show a viable value for
the default configuration these days.
This commit is contained in:
PatR
2021-10-05 01:11:24 -07:00
parent 013f3770d1
commit ccfddd47de
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -838,7 +838,7 @@ struct instance_globals {
int locknum; /* max num of simultaneous users */
#endif
#ifdef DEF_PAGER
char *catmore; /* default pager */
const char *catmore; /* external pager; from getenv() or DEF_PAGER */
#endif
#ifdef MICRO
char levels[PATHLEN]; /* where levels are */

8
include/unixconf.h
View File

@@ -93,10 +93,12 @@
/*
* Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
* If defined, it can be overridden by the environment variable PAGER.
* Hack will use its internal pager if DEF_PAGER is not defined.
* (This might be preferable for security reasons.)
* NetHack will use its internal pager if DEF_PAGER is not defined _or_
* if DLB is defined since an external pager won't know how to access the
* contents of the dlb container file.
* (Note: leaving DEF_PAGER undefined is preferable for security reasons.)
*/
/* #define DEF_PAGER ".../mydir/mypager" */
/* #define DEF_PAGER "/usr/bin/less" */
/*
* Define PORT_HELP to be the name of the port-specfic help file.

3
sys/unix/unixmain.c
View File

@@ -220,7 +220,8 @@ main(int argc, char *argv[])
#endif
#ifdef DEF_PAGER
if (!(g.catmore = nh_getenv("HACKPAGER"))
if (!(g.catmore = nh_getenv("NETHACKPAGER"))
&& !(g.catmore = nh_getenv("HACKPAGER"))
&& !(g.catmore = nh_getenv("PAGER")))
g.catmore = DEF_PAGER;
#endif

16
win/tty/wintty.c
View File

@@ -36,6 +36,20 @@ extern void msmsg(const char *, ...);
#endif
#endif
#ifdef DEF_PAGER
/* DEF_PAGER implies UNIX; when dlb is in use, the only file accessible
to an external pager is 'license'; override 'DEF_PAGER' for that
situation rather than using code to fallback to DLB plus internal
pager after open() failure */
#ifdef DLB
#undef DEF_PAGER
#else
#ifndef O_RDONLY /* (same logic as unixmain.c) */
#include <fcntl.h>
#endif
#endif /* DLB */
#endif /* DEF_PAGER */
#if defined(TTY_TILES_ESCCODES) || defined(TTY_SOUND_ESCCODES)
#define VT_ANSI_COMMAND 'z'
#endif
@@ -2791,7 +2805,7 @@ tty_display_file(const char *fname, boolean complain)
#ifdef DEF_PAGER /* this implies that UNIX is defined */
{
/* use external pager; this may give security problems */
register int fd = open(fname, 0);
int fd = open(fname, O_RDONLY);
if (fd < 0) {
if (complain)