-/* $NetBSD: machdep.c,v 1.14 2006/04/24 19:00:30 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $ */
/*
* Copyright (c) 1988, 1993
#if 0
static char sccsid[] = "@(#)machdep.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: machdep.c,v 1.14 2006/04/24 19:00:30 snj Exp $");
+__RCSID("$NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $");
#endif
#endif /* not lint */
*
* All UNIX code should be included between the single "#ifdef UNIX" at the
* top of this file, and the "#endif" at the bottom.
- *
+ *
* To change a routine to include a new UNIX system, simply #ifdef the
* existing routine, as in the following example:
*
* #endif
* }
*
- * Appropriate variations of this are of course acceptible.
+ * Appropriate variations of this are of course acceptable.
* The use of "#elseif" is discouraged because of non-portability.
* If the correct #define doesn't exist, "UNIX_SYSV" in this case, make it up
* and insert it in the list at the top of the file. Alter the CFLAGS
*/
void
-md_slurp()
+md_slurp(void)
{
(void)fpurge(stdin);
}
*/
void
-md_heed_signals()
+md_heed_signals(void)
{
signal(SIGINT, onintr);
signal(SIGQUIT, byebye);
*/
void
-md_ignore_signals()
+md_ignore_signals(void)
{
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, SIG_IGN);
*/
int
-md_get_file_id(fname)
- const char *fname;
+md_get_file_id(const char *fname)
{
struct stat sbuf;
if (stat(fname, &sbuf)) {
return(-1);
}
- return((int) sbuf.st_ino);
+ return((int)sbuf.st_ino);
}
/* md_link_count():
*/
int
-md_link_count(fname)
- const char *fname;
+md_link_count(const char *fname)
{
struct stat sbuf;
stat(fname, &sbuf);
- return((int) sbuf.st_nlink);
+ return((int)sbuf.st_nlink);
}
/* md_gct(): (Get Current Time)
* system doesn't provide all of the time units requested here, then you
* can provide only those that it does, and return zeros for the others.
* If you cannot provide good time values, then users may be able to copy
- * saved-game files and play them.
+ * saved-game files and play them.
*/
void
-md_gct(rt_buf)
- struct rogue_time *rt_buf;
+md_gct(struct rogue_time *rt_buf)
{
struct tm *t;
time_t seconds;
* exactly the same here.
* Or if md_gct() is implemented correctly, but your system does not provide
* file modification dates, you may return some date far in the past so
- * that the program will never know that a saved-game file being modified.
+ * that the program will never know that a saved-game file being modified.
* You may also do this if you wish to be able to restore games from
* saved-games that have been modified.
*/
void
-md_gfmt(fname, rt_buf)
- const char *fname;
- struct rogue_time *rt_buf;
+md_gfmt(const char *fname, struct rogue_time *rt_buf)
{
struct stat sbuf;
time_t seconds;
struct tm *t;
stat(fname, &sbuf);
- seconds = (long) sbuf.st_mtime;
+ seconds = sbuf.st_mtime;
t = localtime(&seconds);
rt_buf->year = t->tm_year;
*/
boolean
-md_df(fname)
- const char *fname;
+md_df(const char *fname)
{
if (unlink(fname)) {
return(0);
*/
const char *
-md_gln()
+md_gln(void)
{
struct passwd *p;
if (!(p = getpwuid(getuid())))
- return((char *)NULL);
- return(p->pw_name);
+ return NULL;
+ return p->pw_name;
}
/* md_sleep:
*/
void
-md_sleep(nsecs)
- int nsecs;
+md_sleep(int nsecs)
{
- (void) sleep(nsecs);
+ (void)sleep(nsecs);
}
/* md_getenv()
*/
char *
-md_getenv(name)
- const char *name;
+md_getenv(const char *name)
{
char *value;
* when no more memory can be allocated.
*/
-char *
-md_malloc(n)
- int n;
+void *
+md_malloc(size_t n)
{
char *t;
* You need to find some single random integer, such as:
* process id.
* current time (minutes + seconds) returned from md_gct(), if implemented.
- *
+ *
* It will not help to return "get_rand()" or "rand()" or the return value of
* any pseudo-RNG. If you don't have a random number, you can just return 1,
* but this means your games will ALWAYS start the same way, and will play
*/
int
-md_gseed()
+md_gseed(void)
{
time_t seconds;
time(&seconds);
- return((int) seconds);
+ return((int)seconds);
}
/* md_exit():
*/
void
-md_exit(status)
- int status;
+md_exit(int status)
{
exit(status);
}
*/
void
-md_lock(l)
- boolean l;
+md_lock(boolean l)
{
- static int fd;
+ static int fd = -1;
short tries;
if (l) {
setegid(egid);
if ((fd = open(_PATH_SCOREFILE, O_RDONLY)) < 1) {
setegid(gid);
- message("cannot lock score file", 0);
+ messagef(0, "cannot lock score file");
return;
}
setegid(gid);
if (!flock(fd, LOCK_EX|LOCK_NB))
return;
} else {
- (void)flock(fd, LOCK_NB);
+ (void)flock(fd, LOCK_UN|LOCK_NB);
(void)close(fd);
}
}
/* md_shell():
*
* This function spawns a shell for the user to use. When this shell is
- * terminated, the game continues. Since this program may often be run
- * setuid to gain access to privileged files, care is taken that the shell
- * is run with the user's REAL user id, and not the effective user id.
- * The effective user id is restored after the shell completes.
+ * terminated, the game continues.
+ *
+ * It is important that the game not give the shell the privileges the
+ * game uses to access the scores file. This version of the game runs
+ * with privileges low by default; only the saved gid (if setgid) or uid
+ * (if setuid) will be privileged, but that privilege is discarded by
+ * exec().
*/
void
-md_shell(shell)
- const char *shell;
+md_shell(const char *shell)
{
int w;
-
- if (!fork()) {
- execl(shell, shell, (char *) 0);
+ pid_t pid;
+
+ pid = fork();
+ switch (pid) {
+ case -1:
+ break;
+ case 0:
+ execl(shell, shell, (char *)NULL);
+ _exit(255);
+ default:
+ waitpid(pid, &w, 0);
+ break;
}
- wait(&w);
}
-#endif
+#endif /* UNIX */
git.ckatri.com / bsdgames-darwin.git / blobdiff