vms catchup

1) filename manipulation during restore
2) hangup handling in low level input routine
3) Makefile dependencies
4) version number update
This commit is contained in:
nethack.rankin
2003-10-21 04:25:35 +00:00
parent 231b2b16f8
commit 537718980d
5 changed files with 20 additions and 14 deletions
+5 -5
View File
@@ -1,4 +1,4 @@
Instructions for Installing NetHack 3.4.2 Instructions for Installing NetHack 3.4.3
on a VMS (aka OpenVMS) system on a VMS (aka OpenVMS) system
========================================= =========================================
@@ -7,7 +7,7 @@
1. Building NetHack requires a C compiler (either Compaq C, DEC C, 1. Building NetHack requires a C compiler (either Compaq C, DEC C,
VAX C, or GNU C) and VMS version V4.6 or later (but see note #9). VAX C, or GNU C) and VMS version V4.6 or later (but see note #9).
This release has been tested with Compaq C V6.4 on Alpha/VMS V7.1 This release has been tested with Compaq C V6.4 on Alpha/VMS V7.3-1
and with VAX C V3.2 and GNU C 2.7.1 on VAX/VMS V5.5-2. The build and with VAX C V3.2 and GNU C 2.7.1 on VAX/VMS V5.5-2. The build
procedure (vmsbuild.com) should not need to be modified; it accepts procedure (vmsbuild.com) should not need to be modified; it accepts
an option for selecting the compiler, and it can detect different an option for selecting the compiler, and it can detect different
@@ -136,8 +136,8 @@
Notes: Notes:
1. Save files and bones files from versions 3.4.0 and 3.4.1 will work 1. Save files and bones files from versions 3.4.0, 3.4.1 and 3.4.2 will
with 3.4.2; those from earlier versions will not. The scoreboard work with 3.4.3; those from earlier versions will not. The scoreboard
file (RECORD) from 3.4.x or 3.3.x will also work; one from version file (RECORD) from 3.4.x or 3.3.x will also work; one from version
3.2.x is slightly different format but should be compatible. 3.2.x is slightly different format but should be compatible.
@@ -476,4 +476,4 @@ Notes:
Always include version information for NetHack, the operating system, Always include version information for NetHack, the operating system,
and the C compiler used. and the C compiler used.
21-AUG-2003 20-OCT-2003
+2 -2
View File
@@ -90,7 +90,7 @@ RANDOBJ = random.obj
# Other things that have to be reconfigured are in vmsconf.h, # Other things that have to be reconfigured are in vmsconf.h,
# and config.h # and config.h
VERSION = 3.4.2 VERSION = 3.4.3
MAKEDEFS = $(UTL)makedefs.exe; MAKEDEFS = $(UTL)makedefs.exe;
@@ -368,7 +368,7 @@ do_wear.obj : do_wear.c $(HACK_H)
dog.obj : dog.c $(HACK_H) $(INC)edog.h dog.obj : dog.c $(HACK_H) $(INC)edog.h
dogmove.obj : dogmove.c $(HACK_H) $(INC)mfndpos.h $(INC)edog.h dogmove.obj : dogmove.c $(HACK_H) $(INC)mfndpos.h $(INC)edog.h
dokick.obj : dokick.c $(HACK_H) $(INC)eshk.h dokick.obj : dokick.c $(HACK_H) $(INC)eshk.h
dothrow.obj : dothrow.c $(HACK_H) dothrow.obj : dothrow.c $(HACK_H) $(INC)edog.h
drawing.obj : drawing.c $(HACK_H) $(INC)tcap.h drawing.obj : drawing.c $(HACK_H) $(INC)tcap.h
dungeon.obj : dungeon.c $(HACK_H) $(INC)dgn_file.h $(INC)dlb.h dungeon.obj : dungeon.c $(HACK_H) $(INC)dgn_file.h $(INC)dlb.h
eat.obj : eat.c $(HACK_H) eat.obj : eat.c $(HACK_H)
+1 -1
View File
@@ -1,5 +1,5 @@
$ ! vms/vmsbuild.com -- compile and link NetHack 3.4.* [pr] $ ! vms/vmsbuild.com -- compile and link NetHack 3.4.* [pr]
$ version_number = "3.4.2" $ version_number = "3.4.3"
$ ! $ !
$ ! usage: $ ! usage:
$ ! $ set default [.src] !or [-.-.src] if starting from [.sys.vms] $ ! $ set default [.src] !or [-.-.src] if starting from [.sys.vms]
+2 -2
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)vmsmain.c 3.4 2003/09/25 */ /* SCCS Id: @(#)vmsmain.c 3.4 2003/10/16 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* main.c - VMS NetHack */ /* main.c - VMS NetHack */
@@ -183,7 +183,7 @@ char *argv[];
*/ */
boolean remember_wiz_mode = wizard; boolean remember_wiz_mode = wizard;
#endif #endif
const char *fq_save = fqname(SAVEF, SAVEPREFIX, 0); const char *fq_save = fqname(SAVEF, SAVEPREFIX, 1);
(void) chmod(fq_save,0); /* disallow parallel restores */ (void) chmod(fq_save,0); /* disallow parallel restores */
(void) signal(SIGINT, (SIG_RET_TYPE) done1); (void) signal(SIGINT, (SIG_RET_TYPE) done1);
+10 -4
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)vmstty.c 3.4 2002/08/21 */ /* SCCS Id: @(#)vmstty.c 3.4 2003/09/18 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* tty.c - (VMS) version */ /* tty.c - (VMS) version */
@@ -106,12 +106,20 @@ int
vms_getchar() vms_getchar()
{ {
short key; short key;
#ifdef USE_QIO_INPUT #ifdef USE_QIO_INPUT
struct _rd_iosb iosb; struct _rd_iosb iosb;
unsigned long sts; unsigned long sts;
unsigned char kb_buf; unsigned char kb_buf;
#else /* SMG input */
static volatile int recurse = 0; /* SMG is not AST re-entrant! */
#endif
if (program_state.done_hup) {
/* hangup has occurred; do not attempt to get further user input */
return ESC;
}
#ifdef USE_QIO_INPUT
if (inc > 0) { if (inc > 0) {
/* we have buffered character(s) from previous read */ /* we have buffered character(s) from previous read */
kb_buf = *inp++; kb_buf = *inp++;
@@ -146,8 +154,6 @@ vms_getchar()
key = getchar(); key = getchar();
#else /*!USE_QIO_INPUT*/ #else /*!USE_QIO_INPUT*/
static volatile int recurse = 0; /* SMG is not AST re-entrant! */
if (recurse++ == 0 && kb != 0) { if (recurse++ == 0 && kb != 0) {
smg$read_keystroke(&kb, &key); smg$read_keystroke(&kb, &key);
switch (key) { switch (key) {