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

sys/unix/*.c formatting and PANICTRACE fix

Browse Source 
I started out just reformatting the function header for regularize()
but ended up doing miscellaneous other stuff, including some code
changes.  I think the CHDIR code is a bit cleaner now, but shouldn't
have any differences in behavior.

Along the way I noticed that 'nethack -dpath' or 'nethack -d path'
modifies argv[] before PANICTRACE attempted to save argv[0], so would
break having nethack invoke gdb to get a backtrace.  ('ARGV0' seems to
be unnecessary since 'hname' holds the same value, but I didn't get rid
of it....)
This commit is contained in:
PatR
2017-09-13 15:33:43 -07:00
parent 127f74bb24
commit cd8f028352
6 changed files with 127 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
sys/unix/unixunix.c
View File

@@ -28,7 +28,8 @@ extern int errno;
static struct stat buf;
/* see whether we should throw away this xlock file */
/* see whether we should throw away this xlock file;
if yes, close it, otherwise leave it open */
static int
veryold(fd)
int fd;
@@ -36,10 +37,10 @@ int fd;
time_t date;
if (fstat(fd, &buf))
return (0); /* cannot get status */
return 0; /* cannot get status */
#ifndef INSURANCE
if (buf.st_size != sizeof(int))
return (0); /* not an xlock file */
if (buf.st_size != sizeof (int))
return 0; /* not an xlock file */
#endif
#if defined(BSD) && !defined(POSIX_TYPES)
(void) time((long *) (&date));
@@ -49,10 +50,10 @@ int fd;
if (date - buf.st_mtime < 3L * 24L * 60L * 60L) { /* recent */
int lockedpid; /* should be the same size as hackpid */
if (read(fd, (genericptr_t) &lockedpid, sizeof(lockedpid))
!= sizeof(lockedpid))
if (read(fd, (genericptr_t) &lockedpid, sizeof lockedpid)
!= sizeof lockedpid)
/* strange ... */
return (0);
return 0;
/* From: Rick Adams <seismo!rick> */
/* This will work on 4.1cbsd, 4.2bsd and system 3? & 5. */
@@ -62,10 +63,10 @@ int fd;
by more than one machine! -pem */
if (!(kill(lockedpid, 0) == -1 && errno == ESRCH))
#endif
return (0);
return 0;
}
(void) close(fd);
return (1);
return 1;
}
static int
@@ -85,8 +86,8 @@ eraseoldlocks()
}
set_levelfile_name(lock, 0);
if (unlink(fqname(lock, LEVELPREFIX, 0)))
return (0); /* cannot remove it */
return (1); /* success! */
return 0; /* cannot remove it */
return 1; /* success! */
}
void
@@ -139,8 +140,8 @@ getlock()
error("Cannot open %s", fq_lock);
}
if (veryold(fd) /* closes fd if true */
&& eraseoldlocks())
/* veryold() closes fd if true */
if (veryold(fd) && eraseoldlocks())
goto gotlock;
(void) close(fd);
} while (i < locknum);
@@ -157,17 +158,20 @@ getlock()
error("Cannot open %s", fq_lock);
}
if (veryold(fd) /* closes fd if true */ && eraseoldlocks())
/* veryold() closes fd if true */
if (veryold(fd) && eraseoldlocks())
goto gotlock;
(void) close(fd);
{
const char destroy_old_game_prompt[] =
"There is already a game in progress under your name. Destroy old game?";
if (iflags.window_inited) {
c = yn("There is already a game in progress under your name. "
"Destroy old game?");
/* this is a candidate for paranoid_confirmation */
c = yn(destroy_old_game_prompt);
} else {
(void) printf(
"\nThere is already a game in progress under your name.");
(void) printf(" Destroy old game? [yn] ");
(void) printf("\n%s [yn] ", destroy_old_game_prompt);
(void) fflush(stdout);
if ((c = getchar()) != EOF) {
int tmp;
@@ -178,10 +182,11 @@ getlock()
; /* eat rest of line and newline */
}
}
}
if (c == 'y' || c == 'Y') {
if (eraseoldlocks())
if (eraseoldlocks()) {
goto gotlock;
else {
} else {
unlock_file(HLOCK);
error("Couldn't destroy old game.");
}
@@ -197,8 +202,8 @@ gotlock:
if (fd == -1) {
error("cannot creat lock file (%s).", fq_lock);
} else {
if (write(fd, (genericptr_t) &hackpid, sizeof(hackpid))
!= sizeof(hackpid)) {
if (write(fd, (genericptr_t) &hackpid, sizeof hackpid)
!= sizeof hackpid) {
error("cannot write lock (%s)", fq_lock);
}
if (close(fd) == -1) {
@@ -207,13 +212,15 @@ gotlock:
}
}
void regularize(s) /* normalize file name - we don't like .'s, /'s, spaces */
/* normalize file name - we don't like .'s, /'s, spaces */
void
regularize(s)
register char *s;
{
register char *lp;
while ((lp = index(s, '.')) || (lp = index(s, '/'))
|| (lp = index(s, ' ')))
while ((lp = index(s, '.')) != 0 || (lp = index(s, '/')) != 0
|| (lp = index(s, ' ')) != 0)
*lp = '_';
#if defined(SYSV) && !defined(AIX_31) && !defined(SVR4) && !defined(LINUX) \
&& !defined(__APPLE__)
@@ -258,10 +265,13 @@ unsigned msec; /* milliseconds */
int
dosh()
{
register char *str;
char *str;
#ifdef SYSCF
if (!sysopt.shellers || !sysopt.shellers[0]
|| !check_user_string(sysopt.shellers)) {
/* FIXME: should no longer assume a particular command keystroke,
and perhaps ought to say "unavailable" rather than "unknown" */
Norep("Unknown command '!'.");
return 0;
}
@@ -284,6 +294,7 @@ child(wt)
int wt;
{
register int f;
suspend_nhwindows((char *) 0); /* also calls end_screen() */
#ifdef _M_UNIX
sco_mapon();
@@ -297,13 +308,13 @@ int wt;
#ifdef CHDIR
(void) chdir(getenv("HOME"));
#endif
return (1);
return 1;
}
if (f == -1) { /* cannot fork */
pline("Fork failed. Try again.");
return (0);
return 0;
}
/* fork succeeded; wait for child to exit */
/* fork succeeded; wait for child to exit */
#ifndef NO_SIGNAL
(void) signal(SIGINT, SIG_IGN);
(void) signal(SIGQUIT, SIG_IGN);
@@ -325,9 +336,9 @@ int wt;
wait_synch();
}
resume_nhwindows();
return (0);
return 0;
}
#endif
#endif /* SHELL || DEF_PAGER || DEF_MAILREADER */
#ifdef GETRES_SUPPORT
@@ -338,34 +349,37 @@ extern int FDECL(nh_getresgid, (gid_t *, gid_t *, gid_t *));
extern gid_t NDECL(nh_getgid);
extern gid_t NDECL(nh_getegid);
int(getresuid)(ruid, euid, suid)
/* the following several functions assume __STDC__ where parentheses
around the name of a function-like macro prevent macro expansion */
int (getresuid)(ruid, euid, suid)
uid_t *ruid, *euid, *suid;
{
return nh_getresuid(ruid, euid, suid);
}
uid_t(getuid)()
uid_t (getuid)()
{
return nh_getuid();
}
uid_t(geteuid)()
uid_t (geteuid)()
{
return nh_geteuid();
}
int(getresgid)(rgid, egid, sgid)
int (getresgid)(rgid, egid, sgid)
gid_t *rgid, *egid, *sgid;
{
return nh_getresgid(rgid, egid, sgid);
}
gid_t(getgid)()
gid_t (getgid)()
{
return nh_getgid();
}
gid_t(getegid)()
gid_t (getegid)()
{
return nh_getegid();
}
@@ -375,12 +389,15 @@ gid_t(getegid)()
/* XXX should be ifdef PANICTRACE_GDB, but there's no such symbol yet */
#ifdef PANICTRACE
boolean
file_exists(const char *path)
file_exists(path)
const char *path;
{
struct stat sb;
/* Just see if it's there - trying to figure out if we can actually
* execute it in all cases is too hard - we really just want to
* catch typos in SYSCF. */
struct stat sb;
* catch typos in SYSCF.
*/
if (stat(path, &sb)) {
return FALSE;
}