nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
Files
47ea9f7ec0b90d2d80e4c22e2902fbfa28ca77bb
nethack/sys/share/pcunix.c
nhmall 3d6fabf730 nhclose 
Changes to be committed:
	modified:   include/extern.h
	modified:   src/bones.c
	modified:   src/do.c
	modified:   src/files.c
	modified:   src/music.c
	modified:   src/restore.c
	modified:   src/save.c
	modified:   sys/share/pcmain.c
	modified:   sys/share/pcsys.c
	modified:   sys/share/pcunix.c

In order to get level file locking correctly again post 3.4.3
with the newer compilers for windows, I had to funnel close()
calls to an intercepting routine.

I had two choices:

1. Surround every close() in at least 9 source files with messy:
	#ifdef WIN32
		nhclose(fd);
	#else
		close(fd);
	#endif

OR

2. Replace every close() with nhclose() and
   deal with the special code in the nhclose()
   version for windows, while just calling
   close() for other platforms (in files.c).

   It is also possible, although not done in this commit,
   to
	#define nhclose(fd) close(fd)
   in a header file for non-windows, rather than funnel
   though a real nhclose() function in files.c.
2015-04-06 10:12:10 -04:00

289 lines
7.2 KiB
C
Raw Blame History

/* NetHack 3.5 pcunix.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 pcunix.c $Date: 2009/05/06 10:50:30 $ $Revision: 1.27 $ */
/* SCCS Id: @(#)pcunix.c 3.5 1994/11/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
/* This file collects some Unix dependencies; pager.c contains some more */
#include "hack.h"
#include "wintty.h"
#include <sys/stat.h>
#if defined(WIN32) || defined(MSDOS)
#include <errno.h>
#endif
#if defined(WIN32) || defined(MSDOS)
extern char orgdir[];
# ifdef WIN32
extern void NDECL(backsp);
# endif
extern void NDECL(clear_screen);
#endif
#if 0
static struct stat buf;
#endif
# ifdef WANT_GETHDATE
static struct stat hbuf;
# endif
#ifdef PC_LOCKING
static int NDECL(eraseoldlocks);
#endif
#if 0
int
uptodate(fd)
int fd;
{
# ifdef WANT_GETHDATE
if(fstat(fd, &buf)) {
pline("Cannot get status of saved level? ");
return(0);
}
if(buf.st_mtime < hbuf.st_mtime) {
pline("Saved level is out of date. ");
return(0);
}
# else
# if (defined(MICRO) || defined(WIN32)) && !defined(NO_FSTAT)
if(fstat(fd, &buf)) {
if(moves > 1) pline("Cannot get status of saved level? ");
else pline("Cannot get status of saved game.");
return(0);
}
if(comp_times(buf.st_mtime)) {
if(moves > 1) pline("Saved level is out of date.");
else pline("Saved game is out of date. ");
/* This problem occurs enough times we need to give the player
* some more information about what causes it, and how to fix.
*/
# ifdef MSDOS
pline("Make sure that your system's date and time are correct.");
pline("They must be more current than NetHack.EXE's date/time stamp.");
# endif /* MSDOS */
return(0);
}
# endif /* MICRO */
# endif /* WANT_GETHDATE */
return(1);
}
#endif
#ifdef PC_LOCKING
static int
eraseoldlocks()
{
register int i;
/* cannot use maxledgerno() here, because we need to find a lock name
* before starting everything (including the dungeon initialization
* that sets astral_level, needed for maxledgerno()) up
*/
for(i = 1; i <= MAXDUNGEON*MAXLEVEL + 1; i++) {
/* try to remove all */
set_levelfile_name(lock, i);
(void) unlink(fqname(lock, LEVELPREFIX, 0));
}
set_levelfile_name(lock, 0);
#ifdef HOLD_LOCKFILE_OPEN
really_close();
#endif
if(unlink(fqname(lock, LEVELPREFIX, 0)))
return 0; /* cannot remove it */
return(1); /* success! */
}
void
getlock()
{
register int fd, c, ci, ct, ern;
int fcmask = FCMASK;
char tbuf[BUFSZ];
const char *fq_lock;
# if defined(MSDOS) && defined(NO_TERMS)
int grmode = iflags.grmode;
# endif
/* we ignore QUIT and INT at this point */
if (!lock_file(HLOCK, LOCKPREFIX, 10)) {
wait_synch();
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("Quitting.");
}
/* regularize(lock); */ /* already done in pcmain */
Sprintf(tbuf,"%s",fqname(lock, LEVELPREFIX, 0));
set_levelfile_name(lock, 0);
fq_lock = fqname(lock, LEVELPREFIX, 1);
if((fd = open(fq_lock,0)) == -1) {
if(errno == ENOENT) goto gotlock; /* no such file */
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
# if defined(WIN32) || defined(HOLD_LOCKFILE_OPEN)
# if defined(HOLD_LOCKFILE_OPEN)
if(errno == EACCES) {
#define OOPS_BUFSZ 512
char oops[OOPS_BUFSZ];
Strcpy(oops,
"\nThere are files from a game in progress under your name.");
Strcat(oops, "\nThe files are locked or inaccessible.");
Strcat(oops, " Is the other game still running?\n");
if (strlen(fq_lock) < ((OOPS_BUFSZ -16) - strlen(oops)))
Sprintf(eos(oops), "Cannot open %s", fq_lock);
Strcat(oops, "\n");
unlock_file(HLOCK);
error(oops);
} else
# endif
error("Bad directory or name: %s\n%s\n",
fq_lock, strerror(errno));
# else
perror(fq_lock);
# endif
unlock_file(HLOCK);
error("Cannot open %s", fq_lock);
}
(void) nhclose(fd);
if(iflags.window_inited) {
# ifdef SELF_RECOVER
c = yn("There are files from a game in progress under your name. Recover?");
# else
pline("There is already a game in progress under your name.");
pline("You may be able to use \"recover %s\" to get it back.\n",tbuf);
c = yn("Do you want to destroy the old game?");
# endif
} else {
# if defined(MSDOS) && defined(NO_TERMS)
grmode = iflags.grmode;
if (grmode) gr_finish();
# endif
c = 'n';
ct = 0;
# ifdef SELF_RECOVER
msmsg(
"There are files from a game in progress under your name. Recover? [yn]");
# else
msmsg("\nThere is already a game in progress under your name.\n");
msmsg("If this is unexpected, you may be able to use \n");
msmsg("\"recover %s\" to get it back.",tbuf);
msmsg("\nDo you want to destroy the old game? [yn] ");
# endif
while ((ci=nhgetch()) != '\n') {
if (ct > 0) {
msmsg("\b \b");
ct = 0;
c = 'n';
}
if (ci == 'y' || ci == 'n' || ci == 'Y' || ci == 'N') {
ct = 1;
c = ci;
msmsg("%c",c);
}
}
}
if(c == 'y' || c == 'Y')
# ifndef SELF_RECOVER
if(eraseoldlocks()) {
# if defined(WIN32CON)
clear_screen(); /* display gets fouled up otherwise */
# endif
goto gotlock;
} else {
unlock_file(HLOCK);
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("Couldn't destroy old game.");
}
# else /*SELF_RECOVER*/
if(recover_savefile()) {
# if defined(WIN32CON)
clear_screen(); /* display gets fouled up otherwise */
# endif
goto gotlock;
} else {
unlock_file(HLOCK);
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("Couldn't recover old game.");
}
# endif /*SELF_RECOVER*/
else {
unlock_file(HLOCK);
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("%s", "Cannot start a new game.");
}
gotlock:
fd = creat(fq_lock, fcmask);
if (fd == -1) ern = errno;
unlock_file(HLOCK);
if(fd == -1) {
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
# if defined(WIN32)
error("cannot creat file (%s.)\n%s\n%s\"%s\" exists?\n",
fq_lock, strerror(ern), " Are you sure that the directory",
fqn_prefix[LEVELPREFIX]);
# else
error("cannot creat file (%s.)", fq_lock);
# endif
} else {
if(write(fd, (char *) &hackpid, sizeof(hackpid))
!= sizeof(hackpid)){
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("cannot write lock (%s)", fq_lock);
}
if(nhclose(fd) == -1) {
# if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
chdirx(orgdir, 0);
# endif
error("cannot close lock (%s)", fq_lock);
}
}
# if defined(MSDOS) && defined(NO_TERMS)
if (grmode) gr_init();
# endif
}
#endif /* PC_LOCKING */
# ifndef WIN32
void
regularize(s)
/*
* normalize file name - we don't like .'s, /'s, spaces, and
* lots of other things
*/
register char *s;
{
register char *lp;
for (lp = s; *lp; lp++)
if (*lp <= ' ' || *lp == '"' || (*lp >= '*' && *lp <= ',') ||
*lp == '.' || *lp == '/' || (*lp >= ':' && *lp <= '?') ||
# ifdef OS2
*lp == '&' || *lp == '(' || *lp == ')' ||
# endif
*lp == '|' || *lp >= 127 || (*lp >= '[' && *lp <= ']'))
*lp = '_';
}
# endif /* WIN32 */
#ifdef __EMX__
void seteuid(int i){;}
#endif
View Git Blame Copy Permalink