-/* $NetBSD: sync.c,v 1.8 1998/03/29 04:56:46 mrg Exp $ */
+/* $NetBSD: sync.c,v 1.18 2001/01/04 03:51:24 jwise Exp $ */
/*
* Copyright (c) 1983, 1993
#if 0
static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: sync.c,v 1.8 1998/03/29 04:56:46 mrg Exp $");
+__RCSID("$NetBSD: sync.c,v 1.18 2001/01/04 03:51:24 jwise Exp $");
#endif
#endif /* not lint */
#include <fcntl.h>
#include <errno.h>
-#ifdef __STDC__
+#include <signal.h>
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <time.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "extern.h"
+#include "pathnames.h"
#define BUFSIZE 4096
+void fmtship(char *, size_t, const char *, struct ship *);
+void makesignal(struct ship *, const char *, struct ship *, ...);
+void makemsg(struct ship *, const char *, ...);
+int sync_exists(int);
+int sync_open(void);
+void sync_close(int);
+void Write(int, struct ship *, long, long, long, long);
+void Writestr(int, struct ship *, const char *);
+int Sync(void);
+static int sync_update(int, struct ship *, const char *, long, long, long, long);
+
+static const char SF[] = _PATH_SYNC;
+static const char LF[] = _PATH_LOCK;
static char sync_buf[BUFSIZE];
static char *sync_bp = sync_buf;
-static char sync_lock[25];
-static char sync_file[25];
+static char sync_lock[sizeof SF];
+static char sync_file[sizeof LF];
static long sync_seek;
static FILE *sync_fp;
-#define SF "/tmp/#sailsink.%d"
-#define LF "/tmp/#saillock.%d"
void
-fmtship(buf, len, fmt, ship)
- char *buf;
- size_t len;
- const char *fmt;
- struct ship *ship;
+fmtship(char *buf, size_t len, const char *fmt, struct ship *ship)
{
while (*fmt) {
if (len-- == 0) {
/*VARARGS3*/
void
-#ifdef __STDC__
makesignal(struct ship *from, const char *fmt, struct ship *ship, ...)
-#else
-makesignal(va_alias)
- va_dcl
-#endif
{
char message[BUFSIZ];
char format[BUFSIZ];
va_list ap;
-#ifndef __STDC__
- struct ship *from;
- const char *fmt;
- struct ship *ship;
- va_start(ap);
- from = va_arg(ap, struct ship *);
- fmt = va_arg(ap, const char *);
- ship = va_arg(ap, struct ship *);
-#else
va_start(ap, ship);
-#endif
fmtship(format, sizeof(format), fmt, ship);
- (void) vsprintf(message, format, ap);
+ vsprintf(message, format, ap);
va_end(ap);
- Write(W_SIGNAL, from, 1, (long)message, 0, 0, 0);
+ Writestr(W_SIGNAL, from, message);
}
+/*VARARGS2*/
void
-#ifdef __STDC__
makemsg(struct ship *from, const char *fmt, ...)
-#else
-makemsg(va_alias)
- va_dcl
-#endif
{
char message[BUFSIZ];
va_list ap;
-#ifndef __STDC__
- struct ship *from;
- const char *fmt;
- va_start(ap);
- from = va_arg(ap, struct ship *);
- fmt = va_arg(ap, const char *);
-#else
va_start(ap, fmt);
-#endif
- (void) vsprintf(message, fmt, ap);
+ vsprintf(message, fmt, ap);
va_end(ap);
- Write(W_SIGNAL, from, 1, (long)message, 0, 0, 0);
+ Writestr(W_SIGNAL, from, message);
}
+
int
-sync_exists(game)
+sync_exists(int game)
{
char buf[sizeof sync_file];
struct stat s;
time_t t;
- (void) sprintf(buf, SF, game);
- (void) time(&t);
- if (stat(buf, &s) < 0)
+ sprintf(buf, SF, game);
+ time(&t);
+ setegid(egid);
+ if (stat(buf, &s) < 0) {
+ setegid(gid);
return 0;
+ }
if (s.st_mtime < t - 60*60*2) { /* 2 hours */
- (void) unlink(buf);
- (void) sprintf(buf, LF, game);
- (void) unlink(buf);
+ unlink(buf);
+ sprintf(buf, LF, game);
+ unlink(buf);
+ setegid(gid);
return 0;
- } else
+ } else {
+ setegid(gid);
return 1;
+ }
}
int
-sync_open()
+sync_open(void)
{
+ struct stat tmp;
if (sync_fp != NULL)
- (void) fclose(sync_fp);
- (void) sprintf(sync_lock, LF, game);
- (void) sprintf(sync_file, SF, game);
- if (access(sync_file, 0) < 0) {
- int omask = umask(issetuid ? 077 : 011);
+ fclose(sync_fp);
+ sprintf(sync_lock, LF, game);
+ sprintf(sync_file, SF, game);
+ setegid(egid);
+ if (stat(sync_file, &tmp) < 0) {
+ mode_t omask = umask(002);
sync_fp = fopen(sync_file, "w+");
- (void) umask(omask);
+ umask(omask);
} else
sync_fp = fopen(sync_file, "r+");
+ setegid(gid);
if (sync_fp == NULL)
return -1;
sync_seek = 0;
}
void
-sync_close(remove)
- char remove;
+sync_close(int remove)
{
if (sync_fp != 0)
- (void) fclose(sync_fp);
- if (remove)
- (void) unlink(sync_file);
+ fclose(sync_fp);
+ if (remove) {
+ setegid(egid);
+ unlink(sync_file);
+ setegid(gid);
+ }
}
void
-Write(type, ship, isstr, a, b, c, d)
- int type;
- struct ship *ship;
- int isstr;
- long a, b, c, d;
+Write(int type, struct ship *ship, long a, long b, long c, long d)
{
- if (isstr)
- (void) sprintf(sync_bp, "%d %d %d %s\n",
- type, ship->file->index, isstr, (char *) a);
- else
- (void) sprintf(sync_bp, "%d %d %d %ld %ld %ld %ld\n",
- type, ship->file->index, isstr, a, b, c, d);
+ sprintf(sync_bp, "%d %d 0 %ld %ld %ld %ld\n",
+ type, ship->file->index, a, b, c, d);
while (*sync_bp++)
;
sync_bp--;
if (sync_bp >= &sync_buf[sizeof sync_buf])
abort();
- (void) sync_update(type, ship, a, b, c, d);
+ sync_update(type, ship, NULL, a, b, c, d);
+}
+
+void
+Writestr(int type, struct ship *ship, const char *a)
+{
+ sprintf(sync_bp, "%d %d 1 %s\n", type, ship->file->index, a);
+ while (*sync_bp++)
+ ;
+ sync_bp--;
+ if (sync_bp >= &sync_buf[sizeof sync_buf])
+ abort();
+ sync_update(type, ship, a, 0, 0, 0, 0);
}
int
-Sync()
+Sync(void)
{
sig_t sighup, sigint;
int n;
int type, shipnum, isstr;
+ char *astr;
long a, b, c, d;
char buf[80];
char erred = 0;
if (errno != EWOULDBLOCK)
return -1;
#else
- if (link(sync_file, sync_lock) >= 0)
+ setegid(egid);
+ if (link(sync_file, sync_lock) >= 0) {
+ setegid(gid);
break;
+ }
+ setegid(gid);
if (errno != EEXIST)
return -1;
#endif
}
if (n <= 0)
return -1;
- (void) fseek(sync_fp, sync_seek, 0);
+ fseek(sync_fp, sync_seek, SEEK_SET);
for (;;) {
switch (fscanf(sync_fp, "%d%d%d", &type, &shipnum, &isstr)) {
case 3:
*p = 0;
for (p = buf; *p == ' '; p++)
;
- a = (long)p;
- b = c = d = 0;
- } else
+ astr = p;
+ a = b = c = d = 0;
+ } else {
if (fscanf(sync_fp, "%ld%ld%ld%ld", &a, &b, &c, &d) != 4)
goto bad;
- if (sync_update(type, SHIP(shipnum), a, b, c, d) < 0)
+ astr = NULL;
+ }
+ if (sync_update(type, SHIP(shipnum), astr, a, b, c, d) < 0)
goto bad;
}
bad:
erred++;
out:
if (!erred && sync_bp != sync_buf) {
- (void) fseek(sync_fp, 0L, 2);
- (void) fwrite(sync_buf, sizeof *sync_buf, sync_bp - sync_buf,
+ fseek(sync_fp, 0L, SEEK_END);
+ fwrite(sync_buf, sizeof *sync_buf, sync_bp - sync_buf,
sync_fp);
- (void) fflush(sync_fp);
+ fflush(sync_fp);
sync_bp = sync_buf;
}
sync_seek = ftell(sync_fp);
#ifdef LOCK_EX
- (void) flock(fileno(sync_fp), LOCK_UN);
+ flock(fileno(sync_fp), LOCK_UN);
#else
- (void) unlink(sync_lock);
+ setegid(egid);
+ unlink(sync_lock);
+ setegid(gid);
#endif
- (void) signal(SIGHUP, sighup);
- (void) signal(SIGINT, sigint);
+ signal(SIGHUP, sighup);
+ signal(SIGINT, sigint);
return erred ? -1 : 0;
}
-int
-sync_update(type, ship, a, b, c, d)
- int type;
- struct ship *ship;
- long a, b, c, d;
+static int
+sync_update(int type, struct ship *ship, const char *astr, long a, long b, long c, long d)
{
switch (type) {
case W_DBP: {
}
case W_UNFOUL: {
struct snag *p = &ship->file->foul[a];
- if (p->sn_count > 0)
+ if (p->sn_count > 0) {
if (b) {
ship->file->nfoul -= p->sn_count;
p->sn_count = 0;
ship->file->nfoul--;
p->sn_count--;
}
+ }
break;
}
case W_UNGRAP: {
struct snag *p = &ship->file->grap[a];
- if (p->sn_count > 0)
+ if (p->sn_count > 0) {
if (b) {
ship->file->ngrap -= p->sn_count;
p->sn_count = 0;
ship->file->ngrap--;
p->sn_count--;
}
+ }
break;
}
case W_SIGNAL:
- if (mode == MODE_PLAYER)
+ if (mode == MODE_PLAYER) {
if (nobells)
- Signal("$$: %s", ship, (char *) a);
+ Signal("$$: %s", ship, astr);
else
- Signal("\7$$: %s", ship, (char *) a);
+ Signal("\7$$: %s", ship, astr);
+ }
break;
case W_CREW: {
struct shipspecs *s = ship->specs;
break;
}
case W_CAPTAIN:
- (void) strncpy(ship->file->captain, (char *)a,
+ strncpy(ship->file->captain, astr,
sizeof ship->file->captain - 1);
ship->file->captain[sizeof ship->file->captain - 1] = 0;
break;
ship->specs->hull = a;
break;
case W_MOVE:
- (void) strncpy(ship->file->movebuf, (char *)a,
+ strncpy(ship->file->movebuf, astr,
sizeof ship->file->movebuf - 1);
ship->file->movebuf[sizeof ship->file->movebuf - 1] = 0;
break;
windspeed = b;
break;
case W_BEGIN:
- (void) strcpy(ship->file->captain, "begin");
+ strcpy(ship->file->captain, "begin");
people++;
break;
case W_END:
git.ckatri.com / bsdgames-darwin.git / blobdiff