Reformat all C files.
I'll push a formatting guide at some point. There may still be outstanding changes, but please feel free to resolve those as you arrive a them. To the best of my knowledge, there is no changes to the actual code content, but the formatter does have the occasional bug. If you run into an issue, please fix it!
This commit is contained in:
Sean Hunt
+207
-196
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 pcunix.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 pcunix.c $NHDT-Date: 1431192778 2015/05/09 17:32:58 $ $NHDT-Branch: master $:$NHDT-Revision: 1.33 $ */
|
||||
/* NetHack 3.6 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. */
|
||||
@@ -9,16 +9,16 @@
|
||||
#include "hack.h"
|
||||
#include "wintty.h"
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(WIN32) || defined(MSDOS)
|
||||
#include <errno.h>
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#if defined(WIN32) || defined(MSDOS)
|
||||
extern char orgdir[];
|
||||
# ifdef WIN32
|
||||
#ifdef WIN32
|
||||
extern void NDECL(backsp);
|
||||
# endif
|
||||
#endif
|
||||
extern void NDECL(clear_screen);
|
||||
#endif
|
||||
|
||||
@@ -26,9 +26,9 @@ extern void NDECL(clear_screen);
|
||||
static struct stat buf;
|
||||
#endif
|
||||
|
||||
# ifdef WANT_GETHDATE
|
||||
#ifdef WANT_GETHDATE
|
||||
static struct stat hbuf;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef PC_LOCKING
|
||||
static int NDECL(eraseoldlocks);
|
||||
@@ -39,7 +39,7 @@ int
|
||||
uptodate(fd)
|
||||
int fd;
|
||||
{
|
||||
# ifdef WANT_GETHDATE
|
||||
#ifdef WANT_GETHDATE
|
||||
if(fstat(fd, &buf)) {
|
||||
pline("Cannot get status of saved level? ");
|
||||
return(0);
|
||||
@@ -48,8 +48,8 @@ int fd;
|
||||
pline("Saved level is out of date. ");
|
||||
return(0);
|
||||
}
|
||||
# else
|
||||
# if (defined(MICRO) || defined(WIN32)) && !defined(NO_FSTAT)
|
||||
#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.");
|
||||
@@ -61,14 +61,14 @@ int fd;
|
||||
/* This problem occurs enough times we need to give the player
|
||||
* some more information about what causes it, and how to fix.
|
||||
*/
|
||||
# ifdef MSDOS
|
||||
#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 */
|
||||
#endif /* MSDOS */
|
||||
return(0);
|
||||
}
|
||||
# endif /* MICRO */
|
||||
# endif /* WANT_GETHDATE */
|
||||
#endif /* MICRO */
|
||||
#endif /* WANT_GETHDATE */
|
||||
return(1);
|
||||
}
|
||||
#endif
|
||||
@@ -77,193 +77,200 @@ int fd;
|
||||
static int
|
||||
eraseoldlocks()
|
||||
{
|
||||
register int i;
|
||||
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);
|
||||
/* 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();
|
||||
really_close();
|
||||
#endif
|
||||
if(unlink(fqname(lock, LEVELPREFIX, 0)))
|
||||
return 0; /* cannot remove it */
|
||||
return(1); /* success! */
|
||||
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.");
|
||||
}
|
||||
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) {
|
||||
/* 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);
|
||||
}
|
||||
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);
|
||||
(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(WIN32)
|
||||
if (!strncmpi(windowprocs.name, "tty", 3))
|
||||
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(WIN32)
|
||||
if (!strncmpi(windowprocs.name, "tty", 3))
|
||||
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.");
|
||||
}
|
||||
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(WIN32)
|
||||
if (!strncmpi(windowprocs.name, "tty", 3))
|
||||
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(WIN32)
|
||||
if (!strncmpi(windowprocs.name, "tty", 3))
|
||||
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
|
||||
}
|
||||
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
|
||||
#ifndef WIN32
|
||||
void
|
||||
regularize(s)
|
||||
/*
|
||||
@@ -272,19 +279,23 @@ regularize(s)
|
||||
*/
|
||||
register char *s;
|
||||
{
|
||||
register char *lp;
|
||||
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 = '_';
|
||||
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 */
|
||||
#endif /* WIN32 */
|
||||
|
||||
#ifdef __EMX__
|
||||
void seteuid(int i){;}
|
||||
void
|
||||
seteuid(int i)
|
||||
{
|
||||
;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user