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

recover fix

Browse Source 
recover had deviated somewhat from NetHack in its
file expectations:
1) A couple of 3.7 fields needed to be accommodated.
2) hard-coded file size values had deviated.

The file sizes are now in an added header file named "filesize.h",
which is included at the bottom of config.h.

There will likely be another commit to write the filename size ahead
of the file name so that the precise number of characters can be read,
but since that will break existing saves, it can go in along with another
save-breaking commit.

This commit doesn't not alter savefiles written by nethack so does not
require an editlevel bump. It does alter the read-in expectation in
recover to match the game and this get recover working again.
This commit is contained in:
nhmall
2020-01-29 09:15:55 -05:00
parent 3c923de0ea
commit 209fab138b
8 changed files with 124 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
util/recover.c
View File

@@ -27,6 +27,7 @@ void FDECL(set_levelfile_name, (int));
int FDECL(open_levelfile, (int));
int NDECL(create_savefile);
void FDECL(copy_bytes, (int, int));
static void FDECL(store_formatindicator, (int));
#ifndef WIN_CE
#define Fprintf (void) fprintf
@@ -37,20 +38,6 @@ static void nhce_message(FILE *, const char *, ...);
#define Close (void) close
#ifdef UNIX
#define SAVESIZE (PL_NSIZ + 13) /* save/99999player.e */
#else
#ifdef VMS
#define SAVESIZE (PL_NSIZ + 22) /* [.save]<uid>player.e;1 */
#else
#ifdef WIN32
#define SAVESIZE (PL_NSIZ + 40) /* username-player.NetHack-saved-game */
#else
#define SAVESIZE FILENAME /* from macconf.h or pcconf.h */
#endif
#endif
#endif
#if defined(EXEPATH)
char *FDECL(exepath, (char *));
#endif
@@ -58,6 +45,8 @@ char *FDECL(exepath, (char *));
#if defined(__BORLANDC__) && !defined(_WIN32)
extern unsigned _stklen = STKSIZ;
#endif
/* SAVESIZE is defined in "filesize.h" */
char savename[SAVESIZE]; /* holds relative path of save file from playground */
int
@@ -216,11 +205,11 @@ restore_savefile(basename)
char *basename;
{
int gfd, lfd, sfd;
int res = 0, lev, savelev, hpid, pltmpsiz;
int res = 0, lev, savelev, hpid, pltmpsiz, filecmc;
xchar levc;
struct version_info version_data;
struct savefile_info sfi;
char plbuf[PL_NSIZ];
char plbuf[PL_NSIZ], indicator;
/* level 0 file contains:
* pid of creating process (ignored here)
@@ -265,6 +254,10 @@ char *basename;
}
if ((read(gfd, (genericptr_t) savename, sizeof savename)
!= sizeof savename)
|| (read(gfd, (genericptr_t) &indicator, sizeof indicator)
!= sizeof indicator)
|| (read(gfd, (genericptr_t) &filecmc, sizeof filecmc)
!= sizeof filecmc)
|| (read(gfd, (genericptr_t) &version_data, sizeof version_data)
!= sizeof version_data)
|| (read(gfd, (genericptr_t) &sfi, sizeof sfi) != sizeof sfi)
@@ -277,6 +270,7 @@ char *basename;
}
/* save file should contain:
* format indicator and cmc
* version info
* savefile info
* player name
@@ -299,6 +293,7 @@ char *basename;
return -1;
}
store_formatindicator(sfd);
if (write(sfd, (genericptr_t) &version_data, sizeof version_data)
!= sizeof version_data) {
Fprintf(stderr, "Error writing %s; recovery failed.\n", savename);
@@ -394,6 +389,19 @@ char *basename;
return res;
}
static void
store_formatindicator(fd)
int fd;
{
char indicate = 'h'; /* historical */
int cmc = 0;
write(fd, (genericptr_t) &indicate, sizeof indicate);
write(fd, (genericptr_t) &cmc, sizeof cmc);
}
#ifdef EXEPATH
#ifdef __DJGPP__
#define PATH_SEPARATOR '/'