-/* $NetBSD: log.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $ */
+/* $NetBSD: log.c,v 1.12 2003/08/07 09:36:54 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: log.c,v 1.8 1998/11/10 13:43:31 hubertf Exp $");
+__RCSID("$NetBSD: log.c,v 1.12 2003/08/07 09:36:54 agc Exp $");
#endif
-#endif not lint
+#endif /* not lint */
#include "include.h"
#include "pathnames.h"
+static FILE *score_fp;
+
int
compar(va, vb)
const void *va, *vb;
return (s);
}
-int
-log_score(list_em)
- int list_em;
+void
+open_score_file()
{
- int i, fd, num_scores = 0, good, changed = 0, found = 0;
- struct passwd *pw;
- FILE *fp;
- char *cp;
- SCORE score[100], thisscore;
- struct utsname name;
+ mode_t old_mask;
+ int score_fd;
+ int flags;
- umask(0);
- fd = open(_PATH_SCORE, O_CREAT|O_RDWR, 0644);
- if (fd < 0) {
+ old_mask = umask(0);
+ score_fd = open(_PATH_SCORE, O_CREAT|O_RDWR, 0664);
+ umask(old_mask);
+ if (score_fd < 0) {
warn("open %s", _PATH_SCORE);
- return (-1);
+ return;
}
+ if (score_fd < 3)
+ exit(1);
+ /* Set the close-on-exec flag. If this fails for any reason, quit
+ * rather than leave the score file open to tampering. */
+ flags = fcntl(score_fd, F_GETFD);
+ if (flags < 0)
+ err(1, "fcntl F_GETFD");
+ flags |= FD_CLOEXEC;
+ if (fcntl(score_fd, F_SETFD, flags) == -1)
+ err(1, "fcntl F_SETFD");
/*
* This is done to take advantage of stdio, while still
* allowing a O_CREAT during the open(2) of the log file.
*/
- fp = fdopen(fd, "r+");
- if (fp == NULL) {
+ score_fp = fdopen(score_fd, "r+");
+ if (score_fp == NULL) {
warn("fdopen %s", _PATH_SCORE);
+ return;
+ }
+}
+
+int
+log_score(list_em)
+ int list_em;
+{
+ int i, num_scores = 0, good, changed = 0, found = 0;
+ struct passwd *pw;
+ char *cp;
+ SCORE score[100], thisscore;
+ struct utsname name;
+ long offset;
+
+ if (score_fp == NULL) {
+ warnx("no score file available");
return (-1);
}
+
#ifdef BSD
- if (flock(fileno(fp), LOCK_EX) < 0)
+ if (flock(fileno(score_fp), LOCK_EX) < 0)
#endif
#ifdef SYSV
- while (lockf(fileno(fp), F_LOCK, 1) < 0)
+ while (lockf(fileno(score_fp), F_LOCK, 1) < 0)
#endif
{
warn("flock %s", _PATH_SCORE);
return (-1);
}
for (;;) {
- good = fscanf(fp, "%s %s %s %d %d %d",
+ good = fscanf(score_fp, SCORE_SCANF_FMT,
score[num_scores].name,
score[num_scores].host,
score[num_scores].game,
if ((pw = (struct passwd *) getpwuid(getuid())) == NULL) {
fprintf(stderr,
"getpwuid failed for uid %d. Who are you?\n",
- getuid());
+ (int)getuid());
return (-1);
}
strcpy(thisscore.name, pw->pw_name);
else
puts("You made the top players list!");
qsort(score, num_scores, sizeof (*score), compar);
- rewind(fp);
+ rewind(score_fp);
for (i = 0; i < num_scores; i++)
- fprintf(fp, "%s %s %s %d %d %d\n",
+ fprintf(score_fp, "%s %s %s %d %d %d\n",
score[i].name, score[i].host,
score[i].game, score[i].planes,
score[i].time, score[i].real_time);
+ fflush(score_fp);
+ if (ferror(score_fp))
+ warn("error writing %s", _PATH_SCORE);
+ /* It is just possible that updating an entry could
+ * have reduced the length of the file, so we
+ * truncate it. The seeks are required for stream/fd
+ * synchronisation by POSIX.1. */
+ offset = ftell(score_fp);
+ lseek(fileno(score_fp), 0, SEEK_SET);
+ ftruncate(fileno(score_fp), offset);
+ rewind(score_fp);
} else {
if (found)
puts("You didn't beat your previous score.");
putchar('\n');
}
#ifdef BSD
- flock(fileno(fp), LOCK_UN);
+ flock(fileno(score_fp), LOCK_UN);
#endif
#ifdef SYSV
/* lock will evaporate upon close */
#endif
- fclose(fp);
+ fclose(score_fp);
printf("%2s: %-8s %-8s %-18s %4s %9s %4s\n", "#", "name", "host",
"game", "time", "real time", "planes safe");
puts("-------------------------------------------------------------------------------");
void
log_score_quit(dummy)
- int dummy;
+ int dummy __attribute__((__unused__));
{
(void)log_score(0);
exit(0);