Merge branch 'NetHack-3.6' of https://github.com/NetHack/NetHack

Author: k21971

dat/.gitignore

@@ -9,6 +9,7 @@ rumors
 bogusmon
 engrave
 epitaph
+grep*.tmp
 x11tiles
 nhtiles.bmp
 *.lev

doc/evilhack-changelog.md

@@ -3318,7 +3318,7 @@ The following changes to date are:
 
 ### Version 0.8.4
 
-- Latest merges from 'vanilla' NetHack 3.6.7 official release (as of April 15th, 2024)
+- Latest merges from 'vanilla' NetHack 3.6.7 official release (as of May 11th, 2024)
 - Initial preparation for new version (0.8.4)
 - Fix: prevent the Amulet of Yendor from being teleported whilst in the
   Sanctum

doc/fixes36.7

@@ -47,12 +47,11 @@ vms: update winprocs.h to ensure that CLR_MAX is defined; necessary for
 	compiling vmsmail.c which uses winprocs.h but not hack.h
 curses: when #quitting, just before the high scores are about to be shown
 	status_window was NULL and dereferenced, so add checks (issue #1090)
-when make was invoked with -j makedefs instances could end up running in
-	parallel and could trample on each other's temp files; default to
-	using mkstemp(); allow a port runtime library implementation that lacks
-	mkstemp() to define HAS_NO_MKSTEMP to revert to the old behaviour;
-	provide a work-alike mkstemp() implementation for windows visual studio
-	so there is no requirement to define HAS_NO_MKSTEMP there
+unix: update Makefile.dat so that if parallel make is used, it will build
+	the data files "engrave", "epitaph", and "bogusmon" sequentially;
+	'makedefs -s' builds all three at once and doing parallel instances
+	of that can produce seemingly mysterious problems by stomping on
+	each other's results
 fix the mingw32 build of NetHack 3.6.7 by updating sys/winnt/Makefile.gcc,
 	sys/winnt/winnt.c and sys/winnt/stubs.c
 

src/objnam.c

@@ -1026,7 +1026,17 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
         releaseobuf(obufp);
     }
 
-    if (program_state.gameover) {
+    /* additional information shown during end-of-game inventory disclosure */
+    if (obj->otyp == T_SHIRT && program_state.gameover
+        /* o_id will be 0 for wizard mode attribute disclosure (formatted
+           via from_what() -> ysimple_name() -> minimal_xname() -> xname()
+           by the enlightenment code; moot here since T-shirts don't affect
+           any attributes (but for 3.7, aprons will have comparable text) */
+        && obj->o_id
+        /* distantname is non-0 for do_screen_description() which is used
+           to produce tooltip text for HTMLDUMP (not supported by nethack) */
+        && !distantname
+        ) {
         char tmpbuf[BUFSZ];
 
         /* disclose without breaking illiterate conduct, but mainly tip off

sys/unix/Makefile.dat

@@ -112,21 +112,27 @@ quest.dat:	quest.txt ../util/makedefs
 oracles:	oracles.txt ../util/makedefs
 	../util/makedefs -h
 
-engrave:	engrave.txt ../util/makedefs
+# note: 'makedefs -s' constructs three files at once: "epitaph", "engrave",
+# and "bogusmon", in that order, but traditional 'make' doesn't provide any
+# way for a Makefile to indicate that; make the third depend on the second
+# and the second depend on the first so that if someone runs parallel make
+# it will be forced to run three instances of 'makedefs -s' sequentially
+# rather than simultaneously; depending upon how 'make' checks timestamps,
+# this might result in building all three of them three times in a row
+# [that will still produce the correct result in the end, and the extra
+# overhead of doing it should be negligible]
+bogusmon:	engrave bogusmon.txt ../util/makedefs
 	../util/makedefs -s
-
-epitaph:	epitaph.txt ../util/makedefs
+engrave:	epitaph engrave.txt ../util/makedefs
 	../util/makedefs -s
-
-bogusmon:	bogusmon.txt ../util/makedefs
+epitaph:	epitaph.txt ../util/makedefs
 	../util/makedefs -s
 
-vaults.dat:	spec_levs
-
 # note: 'options' should have already been made when include/date.h was created
 options:	../util/makedefs
 	../util/makedefs -v
 
+vaults.dat:	spec_levs
 
 spec_levs: ../util/lev_comp \
 	bigroom.des castle.des endgame.des gehennom.des goblintown.des \

util/makedefs.c

@@ -52,12 +52,6 @@
 #define rewind(fp) fseek((fp), 0L, SEEK_SET) /* guarantee a return value */
 #endif
 
-#ifndef HAS_NO_MKSTEMP
-#ifdef _MSC_VER
-static int FDECL(mkstemp, (char *));
-#endif
-#endif
-
 #if defined(UNIX) && !defined(LINT) && !defined(GCC_WARN)
 static const char SCCS_Id[] UNUSED = "@(#)makedefs.c\t3.6\t2020/03/04";
 #endif
@@ -136,8 +130,6 @@ static struct version_info version;
 #define CLOSE_OFF_TABLE_STRING "99" /* for the close table */
 #define FAR_OFF_TABLE_STRING "0xff" /* for the far table */
 
-#define FLG_TEMPFILE  0x01              /* flag for temp file */
-
 #define sign(z) ((z) < 0 ? -1 : ((z) ? 1 : 0))
 #ifdef VISION_TABLES
 static char xclear[MAX_ROW][MAX_COL];
@@ -179,7 +171,7 @@ extern void NDECL(objects_init); /* objects.c */
 static void NDECL(link_sanity_check);
 static char *FDECL(name_file, (const char *, const char *));
 static void FDECL(delete_file, (const char *template, const char *));
-static FILE *FDECL(getfp, (const char *, const char *, const char *, int));
+static FILE *FDECL(getfp, (const char *, const char *, const char *));
 static void FDECL(do_ext_makedefs, (int, char **));
 
 static void NDECL(make_version);
@@ -190,7 +182,8 @@ static char *FDECL(xcrypt, (const char *));
 static unsigned long FDECL(read_rumors_file,
                            (const char *, int *, long *, unsigned long));
 static boolean FDECL(get_gitinfo, (char *, char *));
-static void FDECL(do_rnd_access_file, (const char *, const char *));
+static void FDECL(do_rnd_access_file,
+                  (const char *, const char *, const char *));
 static boolean FDECL(d_filter, (char *));
 static boolean FDECL(h_filter, (char *));
 static void NDECL(build_savebones_compat_string);
@@ -374,16 +367,19 @@ char *options;
              * post-3.6.5:
              *  File must not be empty to avoid divide by 0
              *  in core's rn2(), so provide a default entry.
+             *  [Second argument is used to construct a temporary file name
+             *  without worrying about whether the file name macros from
+             *  global.h have been modified with port-specific punctuation.]
              */
-            do_rnd_access_file(EPITAPHFILE,
+            do_rnd_access_file(EPITAPHFILE, "epitaph",
                 /* default epitaph:  parody of the default engraving */
                                "No matter where I went, here I am.");
-            do_rnd_access_file(ENGRAVEFILE,
+            do_rnd_access_file(ENGRAVEFILE, "engrave",
                 /* default engraving:  popularized by "The Adventures of
                    Buckaroo Bonzai Across the 8th Dimenstion" but predates
                    that 1984 movie; some attribute it to Confucius */
                                "No matter where you go, there you are.");
-            do_rnd_access_file(BOGUSMONFILE,
+            do_rnd_access_file(BOGUSMONFILE, "bogusmon",
                 /* default bogusmon:  iconic monster that isn't in nethack */
                                "grue");
             break;
@@ -429,39 +425,16 @@ const char *tag;
 }
 
 static FILE *
-getfp(template, tag, mode, flg)
+getfp(template, tag, mode)
 const char *template;
 const char *tag;
 const char *mode;
-#ifndef HAS_NO_MKSTEMP
-int flg;
-#else
-int flg UNUSED;
-#endif
 {
     char *name = name_file(template, tag);
-    FILE *rv = (FILE *) 0;
-#ifndef HAS_NO_MKSTEMP
-    boolean istemp = (flg & FLG_TEMPFILE) != 0;
-    char tmpfbuf[MAXFNAMELEN];
-    int tmpfd;
-#endif
-
-#ifndef HAS_NO_MKSTEMP
-    if (istemp) {
-        (void) snprintf(tmpfbuf, sizeof tmpfbuf, DATA_TEMPLATE, "mdXXXXXX");
-        tmpfd = mkstemp(tmpfbuf);
-        if (tmpfd >= 0)
-            rv = fdopen(tmpfd, WRTMODE);   /* temp file is always read+write */
-    } else
-#endif
-    rv = fopen(name, mode);
+    FILE *rv = fopen(name, mode);
+
     if (!rv) {
-        Fprintf(stderr, "Can't open '%s'.\n",
-#ifndef HAS_NO_MKSTEMP
-                istemp ? tmpfbuf :
-#endif
-                name);
+        Fprintf(stderr, "Can't open '%s'.\n", name);
         exit(EXIT_FAILURE);
     }
     return rv;
@@ -485,7 +458,7 @@ static int FDECL(grep_check_id, (const char *));
 static void FDECL(grep_show_wstack, (const char *));
 static char *FDECL(do_grep_control, (char *));
 static void NDECL(do_grep);
-static void FDECL(grep0, (FILE *, FILE *, int));
+static void FDECL(grep0, (FILE *, FILE *));
 
 static int grep_trace = 0;
 
@@ -836,7 +809,7 @@ char *buf;
 }
 #endif
 
-static void grep0(FILE *, FILE *, int);
+static void grep0(FILE *, FILE *);
 
 static void
 do_grep()
@@ -851,26 +824,14 @@ do_grep()
         exit(EXIT_FAILURE);
     }
 
-    grep0(inputfp, outputfp, 0);
+    grep0(inputfp, outputfp);
 }
 
 static void
-grep0(inputfp0, outputfp0, flg)
+grep0(inputfp0, outputfp0)
 FILE *inputfp0;
 FILE *outputfp0;
-#ifndef HAS_NO_MKSTEMP
-int flg;
-#else
-int flg UNUSED;
-#endif
 {
-#ifndef HAS_NO_MKSTEMP
-    /* if grep0 is passed FLG_TEMPFILE flag, it will
-       leave the output file open when it returns.
-       The caller will have to take care of calling
-       fclose() when it is done with the file */
-    boolean istemp = (flg & FLG_TEMPFILE) != 0;
-#endif
     char buf[16384]; /* looong, just in case */
 
     while (!feof(inputfp0) && !ferror(inputfp0)) {
@@ -910,12 +871,7 @@ int flg UNUSED;
         exit(EXIT_FAILURE);
     }
     fclose(inputfp0);
-#ifndef HAS_NO_MKSTEMP
-    if (istemp)
-        rewind(outputfp0);
-    else
-#endif
-        fclose(outputfp0);
+    fclose(outputfp0);
     if (grep_sp) {
         Fprintf(stderr, "%d unterminated conditional level%s\n", grep_sp,
                 grep_sp == 1 ? "" : "s");
@@ -1013,12 +969,13 @@ unsigned long old_rumor_offset;
 }
 
 static void
-do_rnd_access_file(fname, deflt_content)
-const char *fname;
+do_rnd_access_file(fname, basefname, deflt_content)
+const char *fname, *basefname;
 const char *deflt_content;
 {
-    char *line, buf[BUFSZ];
+    char *line, greptmp[8 + 1 + 3 + 1];
 
+    Sprintf(greptmp, "grep-%.3s.tmp", basefname);
     Sprintf(filename, DATA_IN_TEMPLATE, fname);
     Strcat(filename, ".txt");
     if (!(ifp = fopen(filename, RDTMODE))) {
@@ -1045,13 +1002,9 @@ const char *deflt_content;
        more likely to be picked than normal but it's nothing to worry about */
     (void) fputs(xcrypt(deflt_content), ofp);
 
-    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
-    grep0(ifp, tfp, FLG_TEMPFILE);
-#ifndef HAS_NO_MKSTEMP
-    ifp = tfp;
-#else
-    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
-#endif
+    tfp = getfp(DATA_TEMPLATE, greptmp, WRTMODE);
+    grep0(ifp, tfp);
+    ifp = getfp(DATA_TEMPLATE, greptmp, RDTMODE);
 
     while ((line = fgetline(ifp)) != 0) {
         if (line[0] != '#' && line[0] != '\n')
@@ -1061,10 +1014,7 @@ const char *deflt_content;
     Fclose(ifp);
     Fclose(ofp);
 
-#ifdef HAS_NO_MKSTEMP
-    delete_file(DATA_TEMPLATE, "grep.tmp");
-#endif
-
+    delete_file(DATA_TEMPLATE, greptmp);
     return;
 }
 
@@ -2335,8 +2285,9 @@ do_oracles()
 void
 do_dungeon()
 {
-    char *line;
+    char *line, greptmp[8 + 1 + 3 + 1];
 
+    Sprintf(greptmp, "grep-%.3s.tmp", "dun");
     Sprintf(filename, DATA_IN_TEMPLATE, DGN_I_FILE);
     if (!(ifp = fopen(filename, RDTMODE))) {
         perror(filename);
@@ -2353,13 +2304,10 @@ do_dungeon()
     }
     Fprintf(ofp, "%s", Dont_Edit_Data);
 
-    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
-    grep0(ifp, tfp, FLG_TEMPFILE);
-#ifndef HAS_NO_MKSTEMP
-    ifp = tfp;
-#else
-    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
-#endif
+    tfp = getfp(DATA_TEMPLATE, greptmp, WRTMODE);
+    grep0(ifp, tfp);
+    ifp = getfp(DATA_TEMPLATE, greptmp, RDTMODE);
+
     while ((line = fgetline(ifp)) != 0) {
         SpinCursor(3);
 
@@ -2370,13 +2318,10 @@ do_dungeon()
         (void) fputs(line, ofp);
         free(line);
     }
-
     Fclose(ifp);
     Fclose(ofp);
 
-#ifdef HAS_NO_MKSTEMP
-    delete_file(DATA_TEMPLATE, "grep.tmp");
-#endif
+    delete_file(DATA_TEMPLATE, greptmp);
     return;
 }
 
@@ -3009,24 +2954,6 @@ char *str;
     return str;
 }
 
-#ifndef HAS_NO_MKSTEMP
-#ifdef _MSC_VER
-int
-mkstemp(template)
-char *template;
-{
-    int err;
-
-    err = _mktemp_s(template, strlen(template) + 1);
-    if( err != 0 )
-        return -1;
-    return _open(template,
-                 _O_RDWR | _O_BINARY | _O_TEMPORARY | _O_CREAT,
-                 _S_IREAD | _S_IWRITE);
-}
-#endif /* _MSC_VER */
-#endif /* HAS_NO_MKSTEMP */
-
 /*
  * macro used to control vision algorithms:
  *      VISION_TABLES => generate tables