updated files

2019-06-23 00:57:38 -04:00
parent adce0147e0
commit ba0f6ed47f
28 changed files with 501 additions and 1135 deletions
--- a/include/decl.h
+++ b/include/decl.h
@@ -7,8 +7,7 @@
 #define DECL_H

 #define E extern
-
-#if !defined(MFLOPPY) && !defined(VMS)
+#if !defined(MFLOPPY) && !defined(VMS) && !defined(WIN32)
 #define LOCKNAMESIZE (PL_NSIZ + 14) /* long enough for uid+name+.99 */
 #define LOCKNAMEINIT "1lock"
 #define BONESINIT "bonesnn.xxx"
@@ -26,32 +25,51 @@
 #define BONESINIT "bonesnn.xxx;1"
 #define BONESSIZE sizeof(BONESINIT)
 #endif
-#endif
-
-/* This is written to a savefile by a defined size on some platforms,
-   so let's not create an automatic and unnecessary incompatibility */
-#if defined(UNIX) || defined(__BEOS__)
-#define SAVESIZE (PL_NSIZ + 50) /* save/99999player.e */
-#else
-#ifdef VMS
-#define SAVESIZE (PL_NSIZ + 50) /* [.save]<uid>player.e;1 */
-#else
 #if defined(WIN32)
-#define SAVESIZE (PL_NSIZ + 50) /* username-player.NetHack-saved-game */
-#else
-#define SAVESIZE FILENAME /* from macconf.h or pcconf.h */
-#endif
+#define LOCKNAMESIZE (PL_NSIZ + 25) /* long enough for username+-+name+.99 */
+#define LOCKNAMEINIT ""
+#define BONESINIT "bonesnn.xxx"
+#define BONESSIZE sizeof(BONESINIT)
 #endif
 #endif

-/* used in files.c */
-#ifdef HOLD_LOCKFILE_OPEN
-struct level_ftrack {
-    int init;
-    int fd;    /* file descriptor for level file     */
-    int oflag; /* open flags                         */
-    boolean nethack_thinks_it_is_open; /* Does NetHack think it's open? */
-};
+#define INDEXT ".xxxxxx"           /* largest indicator suffix */
+#define INDSIZE sizeof(INDEXT)
+
+#if defined(UNIX) || defined(__BEOS__)
+#define SAVEX "save/99999.e"
+#ifndef SAVE_EXTENSION
+#define SAVE_EXTENSION ""
+#endif
+#else /* UNIX || __BEOS__ */
+#ifdef VMS
+#define SAVEX "[.save]nnnnn.e;1"
+#ifndef SAVE_EXTENSION
+#define SAVE_EXTENSION ""
+#endif
+#else /* VMS */
+#if defined(WIN32) || defined(MICRO)
+#define SAVEX ""
+#if !defined(SAVE_EXTENSION)
+#ifdef MICRO
+#define SAVE_EXTENSION ".sav"
+#endif
+#ifdef WIN32
+#define SAVE_EXTENSION ".NetHack-saved-game"
+#endif
+#endif /* !SAVE_EXTENSION */
+#endif /* WIN32 || MICRO */
+#endif /* else !VMS */
+#endif /* else !(UNIX || __BEOS__) */
+
+#ifndef SAVE_EXTENSION
+#define SAVE_EXTENSION ""
+#endif
+
+#ifndef MICRO
+#define SAVESIZE (PL_NSIZ + sizeof(SAVEX) + sizeof(SAVE_EXTENSION) + INDSIZE)
+#else
+#define SAVESIZE FILENAME
 #endif

 /* max size of a windowtype option */
@@ -391,13 +409,11 @@ E const char *const monexplain[], invisexplain[], *const oclass_names[];
 E const char *fqn_prefix_names[PREFIX_COUNT];
 #endif

-struct restore_procs {
+struct restore_info {
 	const char *name;
 	int mread_flags;
-	void NDECL((*restore_minit));
-	void FDECL((*restore_mread), (int,genericptr_t,unsigned int));
-	void FDECL((*restore_bclose), (int));
 };
+E struct restore_info restoreinfo;

 E NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo;

@@ -915,9 +931,6 @@ struct instance_globals {
    boolean chosen_symset_start;
    boolean chosen_symset_end;
    int symset_which_set;
-#ifdef HOLD_LOCKFILE_OPEN
-    struct level_ftrack lftrack;
-#endif /*HOLD_LOCKFILE_OPEN*/
    char SAVEF[SAVESIZE]; /* holds relative path of save file from playground */
 #ifdef MICRO
    char SAVEP[SAVESIZE]; /* holds path of directory for save file */
--- a/include/extern.h
+++ b/include/extern.h
@@ -838,9 +838,6 @@ E boolean NDECL(recover_savefile);
 E void NDECL(assure_syscf_file);
 #endif
 E int FDECL(nhclose, (int));
-#ifdef HOLD_LOCKFILE_OPEN
-E void NDECL(really_close);
-#endif
 #ifdef DEBUG
 E boolean FDECL(debugcore, (const char *, BOOLEAN_P));
 #endif
@@ -2121,8 +2118,6 @@ E int FDECL(restore_menu, (winid));
 #endif
 E void NDECL(minit);
 E boolean FDECL(lookup_id_mapping, (unsigned, unsigned *));
-E void FDECL(mread, (int, genericptr_t, unsigned int));
-E void FDECL(newread, (NHFILE *, int, int, genericptr_t, unsigned int));
 E int FDECL(validate, (NHFILE *, const char *));
 E void NDECL(reset_restpref);
 E void FDECL(set_restpref, (const char *));
@@ -2208,17 +2203,7 @@ E void NDECL(co_false);
 E void FDECL(savelev, (NHFILE *, XCHAR_P));
 #endif
 E genericptr_t FDECL(mon_to_buffer, (struct monst *, int *));
-E void FDECL(bufon, (int));
-E void FDECL(bufoff, (int));
-E void FDECL(bflush, (int));
-E void FDECL(bwrite, (int, genericptr_t, unsigned int));
-E void FDECL(bclose, (int));
-E void FDECL(def_bclose, (int));
-E void FDECL(newwrite, (NHFILE *, int, int, genericptr_t, unsigned int));
-E void FDECL(newclose, (NHFILE *));
-#if defined(ZEROCOMP)
-E void FDECL(zerocomp_bclose, (int));
-#endif
+E boolean FDECL(close_check, (int));
 E void FDECL(savecemetery, (NHFILE *, struct cemetery **));
 E void FDECL(savefruitchn, (NHFILE *));
 E void FDECL(store_plname_in_file, (NHFILE *));
@@ -2231,6 +2216,40 @@ E void FDECL(assignlog, (char *, char*, int));
 E FILE *FDECL(getlog, (NHFILE *));
 E void FDECL(closelog, (NHFILE *));

+
+/* ### sfstruct.c ### */
+
+#ifndef TRACE_BUFFERING
+E void FDECL(newread, (NHFILE *, int, int, genericptr_t, unsigned int));
+E void FDECL(bufon, (int));
+E void FDECL(bufoff, (int));
+E void FDECL(bflush, (int));
+E void FDECL(bwrite, (int, genericptr_t, unsigned int));
+E void FDECL(mread, (int, genericptr_t, unsigned int));
+E void NDECL(minit);
+E void FDECL(bclose, (int));
+#else
+#define bufon(x) Bufon(x,__FUNCTION__, __LINE__)
+#define bufoff(x) Bufoff(x,__FUNCTION__, __LINE__)
+#define bflush(x) Bflush(x,__FUNCTION__, __LINE__)
+#define bwrite(x,y,z) Bwrite(x,y,z,__FUNCTION__, __LINE__)
+#define bclose(x) Bclose(x,__FUNCTION__, __LINE__)
+#define mread(x,y,z) Mread(x,y,z,__FUNCTION__, __LINE__)
+#define minit() Minit(__FUNCTION__, __LINE__)
+#endif
+E void FDECL(Bufon, (int, const char *, int));
+E void FDECL(Bufoff, (int, const char *, int));
+E void FDECL(Bflush, (int, const char *, int));
+E void FDECL(Bwrite, (int, genericptr_t, unsigned int, const char *, int));
+E void FDECL(Bread, (int, genericptr_t, unsigned int, const char *, int));
+E void FDECL(Binit,(const char *, int));
+E void FDECL(Bclose, (int, const char *, int));
+E void FDECL(Mread, (int, genericptr_t, unsigned int, const char *, int));
+E void FDECL(Minit, (const char *, int));
+#if defined(ZEROCOMP)
+E void FDECL(zerocomp_bclose, (int));
+#endif
+
 /* ### shk.c ### */

 E void FDECL(setpaid, (struct monst *));
@@ -2643,6 +2662,7 @@ E boolean FDECL(comp_times, (long));
 E boolean
 FDECL(check_version, (struct version_info *, const char *, BOOLEAN_P, unsigned long));
 E boolean FDECL(uptodate, (NHFILE *, const char *, unsigned long));
+E void FDECL(store_formatindicator, (NHFILE *));
 E void FDECL(store_version, (NHFILE *));
 E unsigned long FDECL(get_feature_notice_ver, (char *));
 E unsigned long NDECL(get_current_feature_ver);
--- a/include/global.h
+++ b/include/global.h
@@ -95,6 +95,7 @@ typedef uchar nhsym;
 #endif
 #endif

+#if 0
 /* comment out to test effects of each #define -- these will probably
 * disappear eventually
 */
@@ -102,6 +103,7 @@ typedef uchar nhsym;
 #define RLECOMP  /* run-length compression of levl array - JLee */
 #define ZEROCOMP /* zero-run compression of everything - Olaf Seibert */
 #endif
+#endif

 /* #define SPECIALIZATION */ /* do "specialized" version of new topology */

--- a/include/hack.h
+++ b/include/hack.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	hack.h	$NHDT-Date: 1561019041 2019/06/20 08:24:01 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.106 $ */
+/* NetHack 3.6	hack.h	$NHDT-Date: 1559227823 2019/05/30 14:50:23 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.105 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Pasi Kallinen, 2017. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -572,6 +572,6 @@ enum bodypart_types {
 #endif

 #define DEVTEAM_EMAIL "devteam@nethack.org"
-#define DEVTEAM_URL "https://www.nethack.org/"
+#define DEVTEAM_URL "http://www.nethack.org"

 #endif /* HACK_H */
--- a/include/monst.h
+++ b/include/monst.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	monst.h	$NHDT-Date: 1561053561 2019/06/20 17:59:21 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.33 $ */
+/* NetHack 3.6	monst.h	$NHDT-Date: 1559994623 2019/06/08 11:50:23 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.32 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2016. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -18,8 +18,6 @@
 #define PC_LOCKING /* Prevent overwrites of aborted or in-progress games */
 /* without first receiving confirmation. */

-#define HOLD_LOCKFILE_OPEN /* Keep an exclusive lock on the .0 file */
-
 #define SELF_RECOVER /* Allow the game itself to recover from an aborted \
                        game */

--- a/include/pcconf.h
+++ b/include/pcconf.h
@@ -180,7 +180,6 @@
 #undef lock
 #include <pc.h> /* kbhit() */
 #define PC_LOCKING
-#define HOLD_LOCKFILE_OPEN
 #define SELF_RECOVER /* NetHack itself can recover games */
 #endif

--- a/include/sfproto.h
+++ b/include/sfproto.h
@@ -1,4 +1,4 @@
-/* NetHack 3.7 sfproto.h	Sat Jun 22 23:55:47 2019 */
+/* NetHack 3.7 sfproto.h	Sat Jun 22 22:53:12 2019 */
 /* Copyright (c) NetHack Development Team 2018.                   */
 /* NetHack may be freely redistributed.  See license for details. */