I wish the socket API didn't require casts. Easy to mess them up.

[bsdgames-darwin.git] / sail / sync.c

diff --git a/sail/sync.c b/sail/sync.c
index ea2bac04b3cbfa012469ec8fa81d2f253be773f7..26b4c10c805b4302b93844fb5858f457d22ad77d 100644 (file)
--- a/sail/sync.c
+++ b/sail/sync.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: sync.c,v 1.34 2013/10/19 17:23:08 christos Exp $       */
+

 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,11 +12,7 @@
  * 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,119 +29,304 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-/*static char sccsid[] = "from: @(#)sync.c     5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: sync.c,v 1.2 1993/08/01 18:51:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)sync.c     8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: sync.c,v 1.34 2013/10/19 17:23:08 christos Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include "externs.h"
-#include <sys/file.h>
-#include <sys/errno.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include "extern.h"
+#include "pathnames.h"

 
 #define BUFSIZE 4096
 
 
 #define BUFSIZE 4096
 

+/* Message types */
+#define W_CAPTAIN      1
+#define W_CAPTURED     2
+#define W_CLASS                3
+#define W_CREW         4
+#define W_DBP          5
+#define W_DRIFT                6
+#define W_EXPLODE      7
+/*      W_FILE         8   not used */
+#define W_FOUL         9
+#define W_GUNL         10
+#define W_GUNR         11
+#define W_HULL         12
+#define W_MOVE         13
+#define W_OBP          14
+#define W_PCREW                15
+#define W_UNFOUL       16
+#define W_POINTS       17
+#define W_QUAL         18
+#define W_UNGRAP       19
+#define W_RIGG         20
+#define W_COL          21
+#define W_DIR          22
+#define W_ROW          23
+#define W_SIGNAL       24
+#define W_SINK         25
+#define W_STRUCK       26
+#define W_TA           27
+#define W_ALIVE                28
+#define W_TURN         29
+#define W_WIND         30
+#define W_FS           31
+#define W_GRAP         32
+#define W_RIG1         33
+#define W_RIG2         34
+#define W_RIG3         35
+#define W_RIG4         36
+#define W_BEGIN                37
+#define W_END          38
+#define W_DDEAD                39
+
+
+static void recv_captain(struct ship *ship, const char *astr);
+static void recv_captured(struct ship *ship, long a);
+static void recv_class(struct ship *ship, long a);
+static void recv_crew(struct ship *ship, long a, long b, long c);
+static void recv_dbp(struct ship *ship, long a, long b, long c, long d);
+static void recv_drift(struct ship *ship, long a);
+static void recv_explode(struct ship *ship, long a);
+static void recv_foul(struct ship *ship, long a);
+static void recv_gunl(struct ship *ship, long a, long b);
+static void recv_gunr(struct ship *ship, long a, long b);
+static void recv_hull(struct ship *ship, long a);
+static void recv_move(struct ship *ship, const char *astr);
+static void recv_obp(struct ship *ship, long a, long b, long c, long d);
+static void recv_pcrew(struct ship *ship, long a);
+static void recv_unfoul(struct ship *ship, long a, long b);
+static void recv_points(struct ship *ship, long a);
+static void recv_qual(struct ship *ship, long a);
+static void recv_ungrap(struct ship *ship, long a, long b);
+static void recv_rigg(struct ship *ship, long a, long b, long c, long d);
+static void recv_col(struct ship *ship, long a);
+static void recv_dir(struct ship *ship, long a);
+static void recv_row(struct ship *ship, long a);
+static void recv_signal(struct ship *ship, const char *astr);
+static void recv_sink(struct ship *ship, long a);
+static void recv_struck(struct ship *ship, long a);
+static void recv_ta(struct ship *ship, long a);
+static void recv_alive(void);
+static void recv_turn(long a);
+static void recv_wind(long a, long b);
+static void recv_fs(struct ship *ship, long a);
+static void recv_grap(struct ship *ship, long a);
+static void recv_rig1(struct ship *ship, long a);
+static void recv_rig2(struct ship *ship, long a);
+static void recv_rig3(struct ship *ship, long a);
+static void recv_rig4(struct ship *ship, long a);
+static void recv_begin(struct ship *ship);
+static void recv_end(struct ship *ship);
+static void recv_ddead(void);
+
+static void Write(int, struct ship *, long, long, long, long);
+static void Writestr(int, struct ship *, const char *);
+
+static int sync_update(int, struct ship *, const char *,
+                      long, long, long, long);
+

 static char sync_buf[BUFSIZE];
 static char *sync_bp = sync_buf;
 static char sync_buf[BUFSIZE];
 static char *sync_bp = sync_buf;

-static char sync_lock[25];
-static char sync_file[25];

 static long sync_seek;
 static FILE *sync_fp;
 static long sync_seek;
 static FILE *sync_fp;

-#define SF "/tmp/#sailsink.%d"
-#define LF "/tmp/#saillock.%d"
+
+static const char *
+get_sync_file(int scenario_number)
+{
+       static char sync_file[NAME_MAX];
+
+       snprintf(sync_file, sizeof(sync_file), _FILE_SYNC, scenario_number);
+       return sync_file;
+}
+
+static const char *
+get_lock_file(int scenario_number)
+{
+       static char sync_lock[NAME_MAX];
+
+       snprintf(sync_lock, sizeof(sync_lock), _FILE_LOCK, scenario_number);
+       return sync_lock;
+}
+
+void
+fmtship(char *buf, size_t len, const char *fmt, struct ship *ship)
+{
+       while (*fmt) {
+               if (len-- == 0) {
+                       *buf = '\0';
+                       return;
+               }
+               if (*fmt == '$' && fmt[1] == '$') {
+                       size_t l = snprintf(buf, len, "%s (%c%c)",
+                           ship->shipname, colours(ship), sterncolour(ship));
+                       buf += l;
+                       len -= l - 1;
+                       fmt += 2;
+               }
+               else
+                       *buf++ = *fmt++;
+       }
+
+       if (len > 0)
+               *buf = '\0';
+}
+

 
 /*VARARGS3*/
 
 /*VARARGS3*/

-makesignal(from, fmt, ship, a, b, c)
-       struct ship *from;
-       char *fmt;
-       register struct ship *ship;
+void
+makesignal(struct ship *from, const char *fmt, struct ship *ship, ...)

 {
 {

-       char message[80];
+       char message[BUFSIZ];
+       char format[BUFSIZ];
+       va_list ap;

 
 

-       if (ship == 0)
-               (void) sprintf(message, fmt, a, b, c);
-       else
-               (void) sprintf(message, fmt,
-                       ship->shipname, colours(ship),
-                       sterncolour(ship), a, b, c);
-       Write(W_SIGNAL, from, 1, (int)message, 0, 0, 0);
+       va_start(ap, ship);
+       fmtship(format, sizeof(format), fmt, ship);
+       vsnprintf(message, sizeof(message), format, ap);
+       va_end(ap);
+       send_signal(from, message);

 }
 
 }
 

-#include <sys/types.h>
-#include <sys/stat.h>
-sync_exists(game)
+/*VARARGS2*/
+void
+makemsg(struct ship *from, const char *fmt, ...)
+{
+       char message[BUFSIZ];
+       va_list ap;
+
+       va_start(ap, fmt);
+       vsnprintf(message, sizeof(message), fmt, ap);
+       va_end(ap);
+       send_signal(from, message);
+}
+
+int
+sync_exists(int gamenum)

 {
 {

-       char buf[sizeof sync_file];
+       const char *path;

        struct stat s;
        time_t t;
 
        struct stat s;
        time_t t;
 

-       (void) sprintf(buf, SF, game);
-       (void) time(&t);
-       if (stat(buf, &s) < 0)
+       path = get_sync_file(gamenum);
+       time(&t);
+       setegid(egid);
+       if (stat(path, &s) < 0) {
+               setegid(gid);

                return 0;
                return 0;

+       }

        if (s.st_mtime < t - 60*60*2) {         /* 2 hours */
        if (s.st_mtime < t - 60*60*2) {         /* 2 hours */

-               (void) unlink(buf);
-               (void) sprintf(buf, LF, game);
-               (void) unlink(buf);
+               unlink(path);
+               path = get_lock_file(gamenum);
+               unlink(path);
+               setegid(gid);

                return 0;
                return 0;

-       } else
+       } else {
+               setegid(gid);

                return 1;
                return 1;

+       }

 }
 
 }
 

-sync_open()
+int
+sync_open(void)

 {
 {

+       const char *sync_file;
+       struct stat tmp;
+

        if (sync_fp != NULL)
        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);
+       sync_file = get_sync_file(game);
+       (void)get_lock_file(game);
+       setegid(egid);
+       if (stat(sync_file, &tmp) < 0) {
+               mode_t omask = umask(002);

                sync_fp = fopen(sync_file, "w+");
                sync_fp = fopen(sync_file, "w+");

-               (void) umask(omask);
+               umask(omask);

        } else
                sync_fp = fopen(sync_file, "r+");
        } else
                sync_fp = fopen(sync_file, "r+");

+       setegid(gid);

        if (sync_fp == NULL)
                return -1;
        sync_seek = 0;
        return 0;
 }
 
        if (sync_fp == NULL)
                return -1;
        sync_seek = 0;
        return 0;
 }
 

-sync_close(remove)
-       char remove;
+void
+sync_close(int doremove)

 {
 {

+       const char *sync_file;
+

        if (sync_fp != 0)
        if (sync_fp != 0)

-               (void) fclose(sync_fp);
-       if (remove)
-               (void) unlink(sync_file);
+               fclose(sync_fp);
+       if (doremove) {
+               sync_file = get_sync_file(game);
+               setegid(egid);
+               unlink(sync_file);
+               setegid(gid);
+       }

 }
 
 }
 

-Write(type, ship, isstr, a, b, c, d)
-       int type;
-       struct ship *ship;
-       char isstr;
-       int a, b, c, d;
+static void
+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, a);
-       else
-               (void) sprintf(sync_bp, "%d %d %d %d %d %d %d\n",
-                       type, ship->file->index, isstr, a, b, c, d);
+       size_t max = sizeof(sync_buf) - (sync_bp - sync_buf);
+       int shipindex = (ship == NULL) ? 0 : ship->file->index;
+
+       snprintf(sync_bp, max, "%d %d 0 %ld %ld %ld %ld\n",
+                      type, shipindex, a, b, c, d);

        while (*sync_bp++)
                ;
        sync_bp--;
        if (sync_bp >= &sync_buf[sizeof sync_buf])
                abort();
        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);

 }
 
 }
 

-Sync()
+static void
+Writestr(int type, struct ship *ship, const char *a)
+{
+       size_t max = sizeof(sync_buf) - (sync_bp - sync_buf);
+       int shipindex = (ship == NULL) ? 0 : ship->file->index;
+
+       snprintf(sync_bp, max, "%d %d 1 %s\n", type, shipindex, 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(void)

 {
        sig_t sighup, sigint;
 {
        sig_t sighup, sigint;

-       register n;
-       int type, shipnum, isstr, a, b, c, d;
+       int n;
+       int type, shipnum, isstr;
+       char *astr;
+       long a, b, c, d;

        char buf[80];
        char erred = 0;
        char buf[80];
        char erred = 0;

-       extern errno;
+#ifndef LOCK_EX
+       const char *sync_file;
+       const char *sync_lock;
+#endif

 
        sighup = signal(SIGHUP, SIG_IGN);
        sigint = signal(SIGINT, SIG_IGN);
 
        sighup = signal(SIGHUP, SIG_IGN);
        sigint = signal(SIGINT, SIG_IGN);


@@ -154,8 +337,14 @@ Sync()
                if (errno != EWOULDBLOCK)
                        return -1;
 #else
                if (errno != EWOULDBLOCK)
                        return -1;
 #else

-               if (link(sync_file, sync_lock) >= 0)
+               sync_file = get_sync_file(game);
+               sync_lock = get_lock_file(game);
+               setegid(egid);
+               if (link(sync_file, sync_lock) >= 0) {
+                       setegid(gid);

                        break;
                        break;

+               }
+               setegid(gid);

                if (errno != EEXIST)
                        return -1;
 #endif
                if (errno != EEXIST)
                        return -1;
 #endif


@@ -163,7 +352,7 @@ Sync()
        }
        if (n <= 0)
                return -1;
        }
        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:
        for (;;) {
                switch (fscanf(sync_fp, "%d%d%d", &type, &shipnum, &isstr)) {
                case 3:


@@ -178,9 +367,13 @@ Sync()
                if (isstr != 0 && isstr != 1)
                        goto bad;
                if (isstr) {
                if (isstr != 0 && isstr != 1)
                        goto bad;
                if (isstr) {

-                       register char *p;
+                       int ch;
+                       char *p;
+

                        for (p = buf;;) {
                        for (p = buf;;) {

-                               switch (*p++ = getc(sync_fp)) {
+                               ch = getc(sync_fp);
+                               *p++ = ch;
+                               switch (ch) {

                                case '\n':
                                        p--;
                                case EOF:
                                case '\n':
                                        p--;
                                case EOF:


@@ -195,228 +388,620 @@ Sync()
                        *p = 0;
                        for (p = buf; *p == ' '; p++)
                                ;
                        *p = 0;
                        for (p = buf; *p == ' '; p++)
                                ;

-                       a = (int)p;
-                       b = c = d = 0;
-               } else
-                       if (fscanf(sync_fp, "%d%d%d%d", &a, &b, &c, &d) != 4)
+                       astr = p;
+                       a = b = c = d = 0;
+               } else {
+                       if (fscanf(sync_fp, "%ld%ld%ld%ld", &a, &b, &c, &d)
+                           != 4)

                                goto bad;
                                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) {
                        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);
                        sync_fp);

-               (void) fflush(sync_fp);
+               fflush(sync_fp);

                sync_bp = sync_buf;
        }
        sync_seek = ftell(sync_fp);
 #ifdef LOCK_EX
                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
 #else

-       (void) unlink(sync_lock);
+       setegid(egid);
+       unlink(sync_lock);
+       setegid(gid);

 #endif
 #endif

-       (void) signal(SIGHUP, sighup);
-       (void) signal(SIGINT, sigint);
+       signal(SIGHUP, sighup);
+       signal(SIGINT, sigint);

        return erred ? -1 : 0;
 }
 
        return erred ? -1 : 0;
 }
 

-sync_update(type, ship, a, b, c, d)
-       int type;
-       register struct ship *ship;
-       int 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) {
 {
        switch (type) {

-       case W_DBP: {
-               register struct BP *p = &ship->file->DBP[a];
-               p->turnsent = b;
-               p->toship = SHIP(c);
-               p->mensent = d;
-               break;
-               }
-       case W_OBP: {
-               register struct BP *p = &ship->file->OBP[a];
-               p->turnsent = b;
-               p->toship = SHIP(c);
-               p->mensent = d;
-               break;
-               }
-       case W_FOUL: {
-               register struct snag *p = &ship->file->foul[a];
-               if (SHIP(a)->file->dir == 0)
-                       break;
-               if (p->sn_count++ == 0)
-                       p->sn_turn = turn;
-               ship->file->nfoul++;
-               break;
-               }
-       case W_GRAP: {
-               register struct snag *p = &ship->file->grap[a];
-               if (SHIP(a)->file->dir == 0)
-                       break;
-               if (p->sn_count++ == 0)
-                       p->sn_turn = turn;
-               ship->file->ngrap++;
-               break;
-               }
-       case W_UNFOUL: {
-               register struct snag *p = &ship->file->foul[a];
-               if (p->sn_count > 0)
-                       if (b) {
-                               ship->file->nfoul -= p->sn_count;
-                               p->sn_count = 0;
-                       } else {
-                               ship->file->nfoul--;
-                               p->sn_count--;
-                       }
-               break;
-               }
-       case W_UNGRAP: {
-               register struct snag *p = &ship->file->grap[a];
-               if (p->sn_count > 0)
-                       if (b) {
-                               ship->file->ngrap -= p->sn_count;
-                               p->sn_count = 0;
-                       } else {
-                               ship->file->ngrap--;
-                               p->sn_count--;
-                       }
-               break;
-               }
-       case W_SIGNAL:
-               if (mode == MODE_PLAYER)
-                       if (nobells)
-                               Signal("%s (%c%c): %s", ship, a);
-                       else
-                               Signal("\7%s (%c%c): %s", ship, a);
-               break;
-       case W_CREW: {
-               register struct shipspecs *s = ship->specs;
-               s->crew1 = a;
-               s->crew2 = b;
-               s->crew3 = c;
-               break;
-               }
-       case W_CAPTAIN:
-               (void) strncpy(ship->file->captain, (char *)a,
-                       sizeof ship->file->captain - 1);
-               ship->file->captain[sizeof ship->file->captain - 1] = 0;
-               break;
-       case W_CAPTURED:
-               if (a < 0)
-                       ship->file->captured = 0;
-               else
-                       ship->file->captured = SHIP(a);
-               break;
-       case W_CLASS:
-               ship->specs->class = a;
-               break;
-       case W_DRIFT:
-               ship->file->drift = a;
-               break;
-       case W_EXPLODE:
-               if ((ship->file->explode = a) == 2)
-                       ship->file->dir = 0;
-               break;
-       case W_FS:
-               ship->file->FS = a;
-               break;
-       case W_GUNL: {
-               register struct shipspecs *s = ship->specs;
-               s->gunL = a;
-               s->carL = b;
-               break;
-               }
-       case W_GUNR: {
-               register struct shipspecs *s = ship->specs;
-               s->gunR = a;
-               s->carR = b;
-               break;
-               }
-       case W_HULL:
-               ship->specs->hull = a;
-               break;
-       case W_MOVE:
-               (void) strncpy(ship->file->movebuf, (char *)a,
-                       sizeof ship->file->movebuf - 1);
-               ship->file->movebuf[sizeof ship->file->movebuf - 1] = 0;
-               break;
-       case W_PCREW:
-               ship->file->pcrew = a;
-               break;
-       case W_POINTS:
-               ship->file->points = a;
-               break;
-       case W_QUAL:
-               ship->specs->qual = a;
-               break;
-       case W_RIGG: {
-               register struct shipspecs *s = ship->specs;
-               s->rig1 = a;
-               s->rig2 = b;
-               s->rig3 = c;
-               s->rig4 = d;
-               break;
-               }
-       case W_RIG1:
-               ship->specs->rig1 = a;
-               break;
-       case W_RIG2:
-               ship->specs->rig2 = a;
-               break;
-       case W_RIG3:
-               ship->specs->rig3 = a;
-               break;
-       case W_RIG4:
-               ship->specs->rig4 = a;
-               break;
-       case W_COL:
-               ship->file->col = a;
-               break;
-       case W_DIR:
-               ship->file->dir = a;
-               break;
-       case W_ROW:
-               ship->file->row = a;
-               break;
-       case W_SINK:
-               if ((ship->file->sink = a) == 2)
-                       ship->file->dir = 0;
-               break;
-       case W_STRUCK:
-               ship->file->struck = a;
-               break;
-       case W_TA:
-               ship->specs->ta = a;
-               break;
-       case W_ALIVE:
-               alive = 1;
-               break;
-       case W_TURN:
-               turn = a;
-               break;
-       case W_WIND:
-               winddir = a;
-               windspeed = b;
-               break;
-       case W_BEGIN:
-               (void) strcpy(ship->file->captain, "begin");
-               people++;
-               break;
-       case W_END:
-               *ship->file->captain = 0;
-               ship->file->points = 0;
-               people--;
-               break;
-       case W_DDEAD:
-               hasdriver = 0;
-               break;
+       case W_CAPTAIN:  recv_captain(ship, astr);    break;
+       case W_CAPTURED: recv_captured(ship, a);      break;
+       case W_CLASS:    recv_class(ship, a);         break;
+       case W_CREW:     recv_crew(ship, a, b, c);    break;
+       case W_DBP:      recv_dbp(ship, a, b, c, d);  break;
+       case W_DRIFT:    recv_drift(ship, a);         break;
+       case W_EXPLODE:  recv_explode(ship, a);       break;
+       case W_FOUL:     recv_foul(ship, a);          break;
+       case W_GUNL:     recv_gunl(ship, a, b);       break;
+       case W_GUNR:     recv_gunr(ship, a, b);       break;
+       case W_HULL:     recv_hull(ship, a);          break;
+       case W_MOVE:     recv_move(ship, astr);       break;
+       case W_OBP:      recv_obp(ship, a, b, c, d);  break;
+       case W_PCREW:    recv_pcrew(ship, a);         break;
+       case W_UNFOUL:   recv_unfoul(ship, a, b);     break;
+       case W_POINTS:   recv_points(ship, a);        break;
+       case W_QUAL:     recv_qual(ship, a);          break;
+       case W_UNGRAP:   recv_ungrap(ship, a, b);     break;
+       case W_RIGG:     recv_rigg(ship, a, b, c, d); break;
+       case W_COL:      recv_col(ship, a);           break;
+       case W_DIR:      recv_dir(ship, a);           break;
+       case W_ROW:      recv_row(ship, a);           break;
+       case W_SIGNAL:   recv_signal(ship, astr);     break;
+       case W_SINK:     recv_sink(ship, a);          break;
+       case W_STRUCK:   recv_struck(ship, a);        break;
+       case W_TA:       recv_ta(ship, a);            break;
+       case W_ALIVE:    recv_alive();                break;
+       case W_TURN:     recv_turn(a);                break;
+       case W_WIND:     recv_wind(a, b);             break;
+       case W_FS:       recv_fs(ship, a);            break;
+       case W_GRAP:     recv_grap(ship, a);          break;
+       case W_RIG1:     recv_rig1(ship, a);          break;
+       case W_RIG2:     recv_rig2(ship, a);          break;
+       case W_RIG3:     recv_rig3(ship, a);          break;
+       case W_RIG4:     recv_rig4(ship, a);          break;
+       case W_BEGIN:    recv_begin(ship);            break;
+       case W_END:      recv_end(ship);              break;
+       case W_DDEAD:    recv_ddead();                break;

        default:
                fprintf(stderr, "sync_update: unknown type %d\r\n", type);
                return -1;
        }
        return 0;
 }
        default:
                fprintf(stderr, "sync_update: unknown type %d\r\n", type);
                return -1;
        }
        return 0;
 }

+
+/*
+ * Messages to send
+ */
+
+void
+send_captain(struct ship *ship, const char *astr)
+{
+       Writestr(W_CAPTAIN, ship, astr);
+}
+
+void
+send_captured(struct ship *ship, long a)
+{
+       Write(W_CAPTURED, ship, a, 0, 0, 0);
+}
+
+void
+send_class(struct ship *ship, long a)
+{
+       Write(W_CLASS, ship, a, 0, 0, 0);
+}
+
+void
+send_crew(struct ship *ship, long a, long b, long c)
+{
+       Write(W_CREW, ship, a, b, c, 0);
+}
+
+void
+send_dbp(struct ship *ship, long a, long b, long c, long d)
+{
+       Write(W_DBP, ship, a, b, c, d);
+}
+
+void
+send_drift(struct ship *ship, long a)
+{
+       Write(W_DRIFT, ship, a, 0, 0, 0);
+}
+
+void
+send_explode(struct ship *ship, long a)
+{
+       Write(W_EXPLODE, ship, a, 0, 0, 0);
+}
+
+void
+send_foul(struct ship *ship, long a)
+{
+       Write(W_FOUL, ship, a, 0, 0, 0);
+}
+
+void
+send_gunl(struct ship *ship, long a, long b)
+{
+       Write(W_GUNL, ship, a, b, 0, 0);
+}
+
+void
+send_gunr(struct ship *ship, long a, long b)
+{
+       Write(W_GUNR, ship, a, b, 0, 0);
+}
+
+void
+send_hull(struct ship *ship, long a)
+{
+       Write(W_HULL, ship, a, 0, 0, 0);
+}
+
+void
+send_move(struct ship *ship, const char *astr)
+{
+       Writestr(W_MOVE, ship, astr);
+}
+
+void
+send_obp(struct ship *ship, long a, long b, long c, long d)
+{
+       Write(W_OBP, ship, a, b, c, d);
+}
+
+void
+send_pcrew(struct ship *ship, long a)
+{
+       Write(W_PCREW, ship, a, 0, 0, 0);
+}
+
+void
+send_unfoul(struct ship *ship, long a, long b)
+{
+       Write(W_UNFOUL, ship, a, b, 0, 0);
+}
+
+void
+send_points(struct ship *ship, long a)
+{
+       Write(W_POINTS, ship, a, 0, 0, 0);
+}
+
+void
+send_qual(struct ship *ship, long a)
+{
+       Write(W_QUAL, ship, a, 0, 0, 0);
+}
+
+void
+send_ungrap(struct ship *ship, long a, long b)
+{
+       Write(W_UNGRAP, ship, a, b, 0, 0);
+}
+
+void
+send_rigg(struct ship *ship, long a, long b, long c, long d)
+{
+       Write(W_RIGG, ship, a, b, c, d);
+}
+
+void
+send_col(struct ship *ship, long a)
+{
+       Write(W_COL, ship, a, 0, 0, 0);
+}
+
+void
+send_dir(struct ship *ship, long a)
+{
+       Write(W_DIR, ship, a, 0, 0, 0);
+}
+
+void
+send_row(struct ship *ship, long a)
+{
+       Write(W_ROW, ship, a, 0, 0, 0);
+}
+
+void
+send_signal(struct ship *ship, const char *astr)
+{
+       Writestr(W_SIGNAL, ship, astr);
+}
+
+void
+send_sink(struct ship *ship, long a)
+{
+       Write(W_SINK, ship, a, 0, 0, 0);
+}
+
+void
+send_struck(struct ship *ship, long a)
+{
+       Write(W_STRUCK, ship, a, 0, 0, 0);
+}
+
+void
+send_ta(struct ship *ship, long a)
+{
+       Write(W_TA, ship, a, 0, 0, 0);
+}
+
+void
+send_alive(void)
+{
+       Write(W_ALIVE, NULL, 0, 0, 0, 0);
+}
+
+void
+send_turn(long a)
+{
+       Write(W_TURN, NULL, a, 0, 0, 0);
+}
+
+void
+send_wind(long a, long b)
+{
+       Write(W_WIND, NULL, a, b, 0, 0);
+}
+
+void
+send_fs(struct ship *ship, long a)
+{
+       Write(W_FS, ship, a, 0, 0, 0);
+}
+
+void
+send_grap(struct ship *ship, long a)
+{
+       Write(W_GRAP, ship, a, 0, 0, 0);
+}
+
+void
+send_rig1(struct ship *ship, long a)
+{
+       Write(W_RIG1, ship, a, 0, 0, 0);
+}
+
+void
+send_rig2(struct ship *ship, long a)
+{
+       Write(W_RIG2, ship, a, 0, 0, 0);
+}
+
+void
+send_rig3(struct ship *ship, long a)
+{
+       Write(W_RIG3, ship, a, 0, 0, 0);
+}
+
+void
+send_rig4(struct ship *ship, long a)
+{
+       Write(W_RIG4, ship, a, 0, 0, 0);
+}
+
+void
+send_begin(struct ship *ship)
+{
+       Write(W_BEGIN, ship, 0, 0, 0, 0);
+}
+
+void
+send_end(struct ship *ship)
+{
+       Write(W_END, ship, 0, 0, 0, 0);
+}
+
+void
+send_ddead(void)
+{
+       Write(W_DDEAD, NULL, 0, 0, 0, 0);
+}
+
+
+/*
+ * Actions upon message receipt
+ */
+
+static void
+recv_captain(struct ship *ship, const char *astr)
+{
+       strlcpy(ship->file->captain, astr, sizeof ship->file->captain);
+}
+
+static void
+recv_captured(struct ship *ship, long a)
+{
+       if (a < 0)
+               ship->file->captured = 0;
+       else
+               ship->file->captured = SHIP(a);
+}
+
+static void
+recv_class(struct ship *ship, long a)
+{
+       ship->specs->class = a;
+}
+
+static void
+recv_crew(struct ship *ship, long a, long b, long c)
+{
+       struct shipspecs *s = ship->specs;
+
+       s->crew1 = a;
+       s->crew2 = b;
+       s->crew3 = c;
+}
+
+static void
+recv_dbp(struct ship *ship, long a, long b, long c, long d)
+{
+       struct BP *p = &ship->file->DBP[a];
+
+       p->turnsent = b;
+       p->toship = SHIP(c);
+       p->mensent = d;
+}
+
+static void
+recv_drift(struct ship *ship, long a)
+{
+       ship->file->drift = a;
+}
+
+static void
+recv_explode(struct ship *ship, long a)
+{
+       if ((ship->file->explode = a) == 2)
+               ship->file->dir = 0;
+}
+
+static void
+recv_foul(struct ship *ship, long a)
+{
+       struct snag *p = &ship->file->foul[a];
+
+       if (SHIP(a)->file->dir == 0)
+               return;
+       if (p->sn_count++ == 0)
+               p->sn_turn = turn;
+       ship->file->nfoul++;
+}
+
+static void
+recv_gunl(struct ship *ship, long a, long b)
+{
+       struct shipspecs *s = ship->specs;
+
+       s->gunL = a;
+       s->carL = b;
+}
+
+static void
+recv_gunr(struct ship *ship, long a, long b)
+{
+       struct shipspecs *s = ship->specs;
+
+       s->gunR = a;
+       s->carR = b;
+}
+
+static void
+recv_hull(struct ship *ship, long a)
+{
+       ship->specs->hull = a;
+}
+
+static void
+recv_move(struct ship *ship, const char *astr)
+{
+       strlcpy(ship->file->movebuf, astr, sizeof ship->file->movebuf);
+}
+
+static void
+recv_obp(struct ship *ship, long a, long b, long c, long d)
+{
+       struct BP *p = &ship->file->OBP[a];
+
+       p->turnsent = b;
+       p->toship = SHIP(c);
+       p->mensent = d;
+}
+
+static void
+recv_pcrew(struct ship *ship, long a)
+{
+       ship->file->pcrew = a;
+}
+
+static void
+recv_unfoul(struct ship *ship, long a, long b)
+{
+       struct snag *p = &ship->file->foul[a];
+
+       if (p->sn_count > 0) {
+               if (b) {
+                       ship->file->nfoul -= p->sn_count;
+                       p->sn_count = 0;
+               } else {
+                       ship->file->nfoul--;
+                       p->sn_count--;
+               }
+       }
+}
+
+static void
+recv_points(struct ship *ship, long a)
+{
+       ship->file->points = a;
+}
+
+static void
+recv_qual(struct ship *ship, long a)
+{
+       ship->specs->qual = a;
+}
+
+static void
+recv_ungrap(struct ship *ship, long a, long b)
+{
+       struct snag *p = &ship->file->grap[a];
+
+       if (p->sn_count > 0) {
+               if (b) {
+                       ship->file->ngrap -= p->sn_count;
+                       p->sn_count = 0;
+               } else {
+                       ship->file->ngrap--;
+                       p->sn_count--;
+               }
+       }
+}
+
+static void
+recv_rigg(struct ship *ship, long a, long b, long c, long d)
+{
+       struct shipspecs *s = ship->specs;
+
+       s->rig1 = a;
+       s->rig2 = b;
+       s->rig3 = c;
+       s->rig4 = d;
+}
+
+static void
+recv_col(struct ship *ship, long a)
+{
+       ship->file->col = a;
+}
+
+static void
+recv_dir(struct ship *ship, long a)
+{
+       ship->file->dir = a;
+}
+
+static void
+recv_row(struct ship *ship, long a)
+{
+       ship->file->row = a;
+}
+
+static void
+recv_signal(struct ship *ship, const char *astr)
+{
+       if (mode == MODE_PLAYER) {
+               if (nobells)
+                       Signal("$$: %s", ship, astr);
+               else
+                       Signal("\a$$: %s", ship, astr);
+       }
+}
+
+static void
+recv_sink(struct ship *ship, long a)
+{
+       if ((ship->file->sink = a) == 2)
+               ship->file->dir = 0;
+}
+
+static void
+recv_struck(struct ship *ship, long a)
+{
+       ship->file->struck = a;
+}
+
+static void
+recv_ta(struct ship *ship, long a)
+{
+       ship->specs->ta = a;
+}
+
+static void
+recv_alive(void)
+{
+       alive = 1;
+}
+
+static void
+recv_turn(long a)
+{
+       turn = a;
+}
+
+static void
+recv_wind(long a, long b)
+{
+       winddir = a;
+       windspeed = b;
+}
+
+static void
+recv_fs(struct ship *ship, long a)
+{
+       ship->file->FS = a;
+}
+
+static void
+recv_grap(struct ship *ship, long a)
+{
+       struct snag *p = &ship->file->grap[a];
+
+       if (SHIP(a)->file->dir == 0)
+               return;
+       if (p->sn_count++ == 0)
+               p->sn_turn = turn;
+       ship->file->ngrap++;
+}
+
+static void
+recv_rig1(struct ship *ship, long a)
+{
+       ship->specs->rig1 = a;
+}
+
+static void
+recv_rig2(struct ship *ship, long a)
+{
+       ship->specs->rig2 = a;
+}
+
+static void
+recv_rig3(struct ship *ship, long a)
+{
+       ship->specs->rig3 = a;
+}
+
+static void
+recv_rig4(struct ship *ship, long a)
+{
+       ship->specs->rig4 = a;
+}
+
+static void
+recv_begin(struct ship *ship)
+{
+       strcpy(ship->file->captain, "begin");
+       people++;
+}
+
+static void
+recv_end(struct ship *ship)
+{
+       *ship->file->captain = 0;
+       ship->file->points = 0;
+       people--;
+}
+
+static void
+recv_ddead(void)
+{
+       hasdriver = 0;
+}