pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
--- a/sys/vms/.gitattributes
+++ b/sys/vms/.gitattributes
@@ -0,0 +1 @@
+Makefile.* filter=NHtext merge=NHsubst
--- a/sys/vms/Makefile.dat
+++ b/sys/vms/Makefile.dat
@@ -1,5 +1,6 @@
 #	NetHack Makefile (VMS) - data files: special levels and other data.
-#	NetHack 3.5	Makefile.dat	$Date$	$Revision$
+#	NetHack 3.5	Makefile.dat	$NHDT-Date$	$NHDT-Branch$:$NHDT-Revision$
+#	NetHack 3.5	Makefile.dat	$Date: 2011/05/23 03:27:10 $	$Revision: 1.5 $

 #  Copy this file to [.dat]Makefile.; no editing needed.

--- a/sys/vms/Makefile.doc
+++ b/sys/vms/Makefile.doc
@@ -1,5 +1,6 @@
 #	NetHack Makefile (VMS) - for the [Unix] documentation.
-#	NetHack 3.5	Makefile.doc	$Date$	$Revision$
+#	NetHack 3.5	Makefile.doc	$NHDT-Date$	$NHDT-Branch$:$NHDT-Revision$
+#	NetHack 3.5	Makefile.doc	$Date: 2011/05/23 03:27:10 $	$Revision: 1.5 $

 #  Copy this file to [.doc]Makefile. and edit it if needed.

--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -1,5 +1,6 @@
 #	NetHack Makefile (VMS) - for building nethack itself.
-#	NetHack 3.5	Makefile.src	$Date$	$Revision$
+#	NetHack 3.5	Makefile.src	$NHDT-Date$	$NHDT-Branch$:$NHDT-Revision$
+#	NetHack 3.5	Makefile.src	$Date: 2011/10/11 02:37:18 $	$Revision: 1.23 $

 #  Copy this file to [.src]Makefile. and then edit it as needed.
 #  The default configuration is for building with DEC C (aka Compaq C).
--- a/sys/vms/Makefile.top
+++ b/sys/vms/Makefile.top
@@ -1,5 +1,6 @@
 #	NetHack Makefile (VMS) - top level for making & installing everything.
-#	NetHack 3.5	Makefile.top	$Date$	$Revision$
+#	NetHack 3.5	Makefile.top	$NHDT-Date$	$NHDT-Branch$:$NHDT-Revision$
+#	NetHack 3.5	Makefile.top	$Date: 2011/05/23 03:27:10 $	$Revision: 1.6 $

 #  Copy this file to <top>Makefile.; edit the appropriate values for
 #  GAMEDIR ("playground" location) and GAMEOWNER (UIC or identifier
--- a/sys/vms/Makefile.utl
+++ b/sys/vms/Makefile.utl
@@ -1,5 +1,6 @@
 #	NetHack Makefile (VMS) - for utility programs.
-#	NetHack 3.5	Makefile.utl	$Date$	$Revision$
+#	NetHack 3.5	Makefile.utl	$NHDT-Date$	$NHDT-Branch$:$NHDT-Revision$
+#	NetHack 3.5	Makefile.utl	$Date: 2011/05/23 03:27:10 $	$Revision: 1.10 $

 #  Copy this file to [.util]Makefile. and then edit it as needed.
 #  The default configuration is for building with DEC C (aka Compaq C).
--- a/sys/vms/install.com
+++ b/sys/vms/install.com
@@ -1,5 +1,8 @@
 $ ! vms/install.com -- set up nethack 'playground'
 $ !
+$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$ ! $Date: 2006/09/23 04:45:56 $  $Revision: 1.4 $
+$ !
 $ ! Use vmsbuild.com to create nethack.exe, makedefs, and lev_comp *first*.
 $ !
 $ ! Edit this file to define gamedir & gameuic, or else invoke it with two
--- a/sys/vms/lev_lex.h
+++ b/sys/vms/lev_lex.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	lev_lex.h	$Date$  $Revision$ */
+/* NetHack 3.5	lev_lex.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	lev_lex.h	$Date: 2009/05/06 10:51:24 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)lev_lex.h	3.5	1999/08/08	*/
 /* "vms/lev_lex.h" copied into "util/stdio.h" for use in *_lex.c only!
 * This is an awful kludge to allow util/*_lex.c made by SunOS's `lex'
--- a/sys/vms/nethack.com
+++ b/sys/vms/nethack.com
@@ -1,6 +1,9 @@
 $! NetHack.Com -- sample command procedure for invoking NetHack  9-JAN-1993
 $ v = 'f$verify(0)'
 $!
+$! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$! $Date: 2002/01/05 21:06:00 $  $Revision: 1.1 $
+$!
 $!    Possible command line arguments include
 $!	"-uConan-B"	!play a barbarian named Conan
 $!	"-u" "Merlin-W" !play a wizard named Merlin (slight variant of above)
--- a/sys/vms/oldcrtl.c
+++ b/sys/vms/oldcrtl.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	oldcrtl.c	$Date$  $Revision$ */
+/* NetHack 3.5	oldcrtl.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	oldcrtl.c	$Date: 2009/05/06 10:51:24 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)oldcrtl.c	3.5	1995/06/01	*/
 /*	 Pat Rankin  May'90					  */
 /* VMS NetHack support, not needed for vms 4.6,4.7,5.x,or later   */
--- a/sys/vms/spec_lev.com
+++ b/sys/vms/spec_lev.com
@@ -1,5 +1,8 @@
 $ ! sys/vms/spec_lev.com -- preprocess nethack's special level compiler code
 $ !
+$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$ ! $Date: 2002/01/05 21:06:00 $  $Revision: 1.1 $
+$ !
 $ ! This operation needs to be performed prior to executing vmsbuild.com.
 $ ! Process the scanning and parsing code for NetHack's special level
 $ ! and dungeon compilers.  *.l and *.y are converted into *'.c and *.h.
--- a/sys/vms/vmsbuild.com
+++ b/sys/vms/vmsbuild.com
@@ -1,5 +1,7 @@
 $ ! vms/vmsbuild.com -- compile and link NetHack 3.5.*			[pr]
 $	version_number = "3.5.0"
+$ ! $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$ ! $Date: 2011/05/23 03:27:10 $  $Revision: 1.8 $
 $ !
 $ ! usage:
 $ !   $ set default [.src]	!or [-.-.src] if starting from [.sys.vms]
--- a/sys/vms/vmsfiles.c
+++ b/sys/vms/vmsfiles.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsfiles.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmsfiles.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsfiles.c	$Date: 2009/05/06 10:51:25 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)vmsfiles.c 3.5	2007/10/27	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/vms/vmsmail.c
+++ b/sys/vms/vmsmail.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsmail.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmsmail.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsmail.c	$Date: 2009/05/06 10:51:25 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)vmsmail.c	3.5	2006/04/14	*/
 /* Copyright (c) Robert Patrick Rankin, 1991.			  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/vms/vmsmain.c
+++ b/sys/vms/vmsmain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsmain.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmsmain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsmain.c	$Date: 2011/04/23 01:51:01 $  $Revision: 1.22 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 /* main.c - VMS NetHack */
@@ -135,13 +136,10 @@ char *argv[];
 	   or holds a generic user name like "player" or "games" */
 	plnamesuffix();

-#ifdef WIZARD
 	if (wizard) {
 		/* use character name rather than lock letter for file names */
 		locknum = 0;
-	} else
-#endif
-	    {
+	} else {
 		/* suppress interrupts while processing lock file */
 		(void) signal(SIGQUIT, SIG_IGN);
 		(void) signal(SIGINT, SIG_IGN);
@@ -268,20 +266,16 @@ char *argv[];
 		case 'I':
 		case 'i':
 			if (!strncmpi(argv[0]+1, "IBM", 3)) {
-#ifdef LOADSYMSETS
 				load_symset("IBMGraphics", PRIMARY);
 				load_symset("RogueIBM", ROGUESET);
 				switch_symbols(TRUE);
-#endif
 			}
 			break;
 	    /*  case 'D': */
 		case 'd':
 			if (!strncmpi(argv[0]+1, "DEC", 3)) {
-#ifdef LOADSYMSETS
 				load_symset("DECGraphics", PRIMARY);
 				switch_symbols(TRUE);
-#endif
 			}
 			break;
 		case 'p': /* profession (role) */
@@ -415,12 +409,10 @@ genericptr_t sigargs, mechargs;	/* [0] is argc, [1..argc] are the real args */
     || (condition >= SS$_ASTFLT && condition <= SS$_TBIT)
     || (condition >= SS$_ARTRES && condition <= SS$_INHCHME)) {
 	program_state.done_hup = TRUE;	/* pretend hangup has been attempted */
-# if defined(WIZARD) && !defined(BETA)
+# ifndef BETA
 	if (wizard)
-# endif /*WIZARD && !BETA*/
-# if defined(WIZARD) ||  defined(BETA)
+# endif /* !BETA */
 	    abort();	/* enter the debugger */
-# endif /*WIZARD || BETA*/
    }
    return SS$_RESIGNAL;
 }
@@ -453,9 +445,7 @@ port_help()
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	if (!strcmpi(nh_getenv("USER"), WIZARD_NAME)) return TRUE;
-#endif
 	wiz_error_flag = TRUE;	/* not being allowed into wizard mode */
 	return FALSE;
 }
@@ -464,12 +454,8 @@ static void
 wd_message()
 {
 	if (wiz_error_flag) {
-#ifdef WIZARD
 		pline("Only user \"%s\" may access debug (wizard) mode.",
 		      WIZARD_NAME);
-#else
-		pline("Debug mode is not available.");
-#endif
 		pline("Entering explore/discovery mode instead.");
 		wizard = 0, discover = 1;		/* (paranoia) */
 	} else if (discover)
--- a/sys/vms/vmsmisc.c
+++ b/sys/vms/vmsmisc.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsmisc.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmsmisc.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsmisc.c	$Date: 2011/09/01 01:47:00 $  $Revision: 1.6 $ */
 /* NetHack may be freely redistributed.  See license for details. */

 #include "config.h"
--- a/sys/vms/vmstty.c
+++ b/sys/vms/vmstty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmstty.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmstty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmstty.c	$Date: 2011/04/13 01:48:13 $  $Revision: 1.10 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 /* tty.c - (VMS) version */
--- a/sys/vms/vmsunix.c
+++ b/sys/vms/vmsunix.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsunix.c	$Date$  $Revision$ */
+/* NetHack 3.5	vmsunix.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsunix.c	$Date: 2011/09/01 01:47:00 $  $Revision: 1.8 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -366,9 +367,7 @@ hack_resume(screen_manip)
 boolean screen_manip;
 {
 	(void) signal(SIGINT, (SIG_RET_TYPE) done1);
-# ifdef WIZARD
 	if (wizard) (void) signal(SIGQUIT,SIG_DFL);
-# endif
 	if (screen_manip)
 	    resume_nhwindows();	/* setup terminal modes, redraw screen, &c */
 }