Sync to 4.4BSD-Lite2

16 files changed, 58 insertions, 366 deletions

diff --git a/Makefile b/Makefile
index afcb5824..671e4c15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.12 1996/12/28 18:59:05 tls Exp $
-#	@(#)Makefile	8.2 (Berkeley) 3/31/94
+#	$NetBSD: Makefile,v 1.13 1997/01/07 12:49:14 tls Exp $
+#	@(#)Makefile	8.3 (Berkeley) 7/24/94
 
 # Missing: ching dungeon hunt warp
 # Moved: chess
diff --git a/sail/assorted.c b/sail/assorted.c
index 9d6ca998..34daf665 100644
--- a/sail/assorted.c
+++ b/sail/assorted.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $	*/
+/*	$NetBSD: assorted.c,v 1.4 1997/01/07 12:42:14 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)assorted.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)assorted.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $";
+static char rcsid[] = "$NetBSD: assorted.c,v 1.4 1997/01/07 12:42:14 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 table(rig, shot, hittable, on, from, roll)
 struct ship *on, *from;
diff --git a/sail/dr_4.c b/sail/dr_4.c
index 723b1025..ddf23e5c 100644
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $	*/
+/*	$NetBSD: dr_4.c,v 1.4 1997/01/07 12:42:15 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)dr_4.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)dr_4.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $";
+static char rcsid[] = "$NetBSD: dr_4.c,v 1.4 1997/01/07 12:42:15 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 ungrap(from, to)
 register struct ship *from, *to;
diff --git a/sail/dr_5.c b/sail/dr_5.c
index 22957744..425909f5 100644
--- a/sail/dr_5.c
+++ b/sail/dr_5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $	*/
+/*	$NetBSD: dr_5.c,v 1.4 1997/01/07 12:42:15 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)dr_5.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)dr_5.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $";
+static char rcsid[] = "$NetBSD: dr_5.c,v 1.4 1997/01/07 12:42:15 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 subtract(from, totalfrom, crewfrom, fromcap, pcfrom)
 struct ship *from, *fromcap;
diff --git a/sail/driver.h b/sail/driver.h
index 34d304e1..3a0cd9d7 100644
--- a/sail/driver.h
+++ b/sail/driver.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: driver.h,v 1.3 1995/04/22 10:36:54 cgd Exp $	*/
+/*	$NetBSD: driver.h,v 1.4 1997/01/07 12:42:16 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -32,9 +32,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)driver.h	8.1 (Berkeley) 5/31/93
+ *	@(#)driver.h	8.2 (Berkeley) 5/3/95
  */
 
-#include "externs.h"
+#include "extern.h"
 
 int dtab[];
diff --git a/sail/extern.h b/sail/extern.h
index 4ee80754..6d9a7703 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: extern.h,v 1.2 1997/01/07 12:42:17 tls Exp $ */
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,6 +37,7 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
 #include <ctype.h>
 #include <setjmp.h>
 #include "machdep.h"
diff --git a/sail/externs.h b/sail/externs.h
deleted file mode 100644
index ad28a387..00000000
--- a/sail/externs.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*	$NetBSD: externs.h,v 1.4 1995/04/24 12:25:15 cgd Exp $	*/
-
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)externs.h	8.1 (Berkeley) 5/31/93
- */
-
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <ctype.h>
-#include <setjmp.h>
-#include "machdep.h"
-
-	/* program mode */
-int mode;
-jmp_buf restart;
-#define MODE_PLAYER	1
-#define MODE_DRIVER	2
-#define MODE_LOGGER	3
-
-	/* command line flags */
-char debug;				/* -D */
-char randomize;				/* -x, give first available ship */
-char longfmt;				/* -l, print score in long format */
-char nobells;				/* -b, don't ring bell before Signal */
-
-	/* other initial modes */
-char issetuid;				/* running setuid */
-
-#define die()		((rand() >> 3) % 6 + 1)
-#define sqr(a)		((a) * (a))
-#define abs(a)		((a) > 0 ? (a) : -(a))
-#define min(a,b)	((a) < (b) ? (a) : (b))
-
-#define grappled(a)	((a)->file->ngrap)
-#define fouled(a)	((a)->file->nfoul)
-#define snagged(a)	(grappled(a) + fouled(a))
-
-#define grappled2(a, b)	((a)->file->grap[(b)->file->index].sn_count)
-#define fouled2(a, b)	((a)->file->foul[(b)->file->index].sn_count)
-#define snagged2(a, b)	(grappled2(a, b) + fouled2(a, b))
-
-#define Xgrappled2(a, b) ((a)->file->grap[(b)->file->index].sn_turn < turn-1 ? grappled2(a, b) : 0)
-#define Xfouled2(a, b)	((a)->file->foul[(b)->file->index].sn_turn < turn-1 ? fouled2(a, b) : 0)
-#define Xsnagged2(a, b)	(Xgrappled2(a, b) + Xfouled2(a, b))
-
-#define cleangrapple(a, b, c)	Cleansnag(a, b, c, 1)
-#define cleanfoul(a, b, c)	Cleansnag(a, b, c, 2)
-#define cleansnag(a, b, c)	Cleansnag(a, b, c, 3)
-
-#define sterncolour(sp)	((sp)->file->stern+'0'-((sp)->file->captured?10:0))
-#define sternrow(sp)	((sp)->file->row + dr[(sp)->file->dir])
-#define sterncol(sp)	((sp)->file->col + dc[(sp)->file->dir])
-
-#define capship(sp)	((sp)->file->captured?(sp)->file->captured:(sp))
-
-#define readyname(r)	((r) & R_LOADING ? '*' : ((r) & R_INITIAL ? '!' : ' '))
-
-/* loadL and loadR, should match loadname[] */
-#define L_EMPTY		0		/* should be 0, don't change */
-#define L_GRAPE		1
-#define L_CHAIN		2
-#define L_ROUND		3
-#define L_DOUBLE	4
-#define L_EXPLODE	5
-
-/*
- * readyL and readyR, these are bits, except R_EMPTY
- */
-#define R_EMPTY		0		/* not loaded and not loading */
-#define R_LOADING	1		/* loading */
-#define R_DOUBLE	2		/* loading double */
-#define R_LOADED	4		/* loaded */
-#define R_INITIAL	8		/* loaded initial */
-
-#define HULL		0
-#define RIGGING		1
-
-#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
-#define W_FILE		8
-#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
-
-#define NLOG 10
-struct logs {
-	char l_name[20];
-	int l_uid;
-	int l_shipnum;
-	int l_gamenum;
-	int l_netpoints;
-};
-
-struct BP {
-	short turnsent;
-	struct ship *toship;
-	short mensent;
-};
-
-struct snag {
-	short sn_count;
-	short sn_turn;
-};
-
-#define NSCENE	nscene
-#define NSHIP	10
-#define NBP	3
-
-#define NNATION	8
-#define N_A	0
-#define N_B	1
-#define N_S	2
-#define N_F	3
-#define N_J	4
-#define N_D	5
-#define N_K	6
-#define N_O	7
-
-struct File {
-	int index;
-	char captain[20];		/* 0 */
-	short points;			/* 20 */
-	char loadL;			/* 22 */
-	char loadR;			/* 24 */
-	char readyL;			/* 26 */
-	char readyR;			/* 28 */
-	struct BP OBP[NBP];		/* 30 */
-	struct BP DBP[NBP];		/* 48 */
-	char struck;			/* 66 */
-	struct ship *captured;		/* 68 */
-	short pcrew;			/* 70 */
-	char movebuf[10];		/* 72 */
-	char drift;			/* 82 */
-	short nfoul;
-	short ngrap;
-	struct snag foul[NSHIP];	/* 84 */
-	struct snag grap[NSHIP];	/* 124 */
-	char RH;			/* 224 */
-	char RG;			/* 226 */
-	char RR;			/* 228 */
-	char FS;			/* 230 */
-	char explode;			/* 232 */
-	char sink;			/* 234 */
-	char dir;
-	short col;
-	short row;
-	char loadwith;
-	char stern;
-};
-
-struct ship {
-	char *shipname;			/* 0 */
-	struct shipspecs *specs;	/* 2 */
-	char nationality;		/* 4 */
-	short shiprow;			/* 6 */
-	short shipcol;			/* 8 */
-	char shipdir;			/* 10 */
-	struct File *file;		/* 12 */
-};
-
-struct scenario {
-	char winddir;			/* 0 */
-	char windspeed;			/* 2 */
-	char windchange;		/* 4 */
-	char vessels;			/* 12 */
-	char *name;			/* 14 */
-	struct ship ship[NSHIP];	/* 16 */
-};
-struct scenario scene[];
-int nscene;
-
-struct shipspecs {
-	char bs;
-	char fs;
-	char ta;
-	short guns;
-	char class;
-	char hull;
-	char qual;
-	char crew1;
-	char crew2;
-	char crew3;
-	char gunL;
-	char gunR;
-	char carL;
-	char carR;
-	char rig1;
-	char rig2;
-	char rig3;
-	char rig4;
-	short pts;
-};
-struct shipspecs specs[];
-
-struct scenario *cc;		/* the current scenario */
-struct ship *ls;		/* &cc->ship[cc->vessels] */
-
-#define SHIP(s)		(&cc->ship[s])
-#define foreachship(sp)	for ((sp) = cc->ship; (sp) < ls; (sp)++)
-
-struct windeffects {
-	char A, B, C, D;
-};
-struct windeffects WET[7][6];
-
-struct Tables {
-	char H, G, C, R;
-};
-struct Tables RigTable[11][6];
-struct Tables HullTable[11][6];
-
-char AMMO[9][4];
-char HDT[9][10];
-char HDTrake[9][10];
-char QUAL[9][5];
-char MT[9][3];
-
-char *countryname[];
-char *classname[];
-char *directionname[];
-char *qualname[];
-char loadname[];
-
-char rangeofshot[];
-
-char dr[], dc[];
-
-int winddir;
-int windspeed;
-int turn;
-int game;
-int alive;
-int people;
-char hasdriver;
-
-char *info();
-char *quality();
-double arctan();
-char *saywhat();
-struct ship *closestenemy();
-
-char *calloc();
-char *rindex();
-char *strcpy();
-char *strcat();
-char *strncpy();
-char *getenv();
-char *gets();
diff --git a/sail/game.c b/sail/game.c
index a6ecc4fc..7dbe3e56 100644
--- a/sail/game.c
+++ b/sail/game.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $	*/
+/*	$NetBSD: game.c,v 1.4 1997/01/07 12:42:19 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)game.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)game.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $";
+static char rcsid[] = "$NetBSD: game.c,v 1.4 1997/01/07 12:42:19 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 maxturns(ship, af)
 register struct ship *ship;
diff --git a/sail/globals.c b/sail/globals.c
index a9e2fd30..7333e653 100644
--- a/sail/globals.c
+++ b/sail/globals.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $	*/
+/*	$NetBSD: globals.c,v 1.5 1997/01/07 12:42:20 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)globals.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $";
+static char rcsid[] = "$NetBSD: globals.c,v 1.5 1997/01/07 12:42:20 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct scenario scene[] = {
 	/*
diff --git a/sail/lo_main.c b/sail/lo_main.c
index c4f3a143..9857b4d7 100644
--- a/sail/lo_main.c
+++ b/sail/lo_main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $	*/
+/*	$NetBSD: lo_main.c,v 1.4 1997/01/07 12:42:21 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,9 +35,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lo_main.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)lo_main.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
+static char rcsid[] = "$NetBSD: lo_main.c,v 1.4 1997/01/07 12:42:21 tls Exp $";
 #endif
 #endif /* not lint */
 
@@ -48,7 +48,7 @@ static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
  */
 #include <sys/types.h>
 #include <pwd.h>
-#include "externs.h"
+#include "extern.h"
 #include "pathnames.h"
 
 char *title[] = {
diff --git a/sail/main.c b/sail/main.c
index 9f8b0f46..615b0cb9 100644
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $	*/
+/*	$NetBSD: main.c,v 1.4 1997/01/07 12:42:22 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,13 +41,13 @@ static char copyright[] =
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.4 1997/01/07 12:42:22 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 /*ARGSUSED*/
 main(argc, argv)
diff --git a/sail/misc.c b/sail/misc.c
index 6dc18c72..5b7591bb 100644
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $	*/
+/*	$NetBSD: misc.c,v 1.4 1997/01/07 12:42:23 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)misc.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $";
+static char rcsid[] = "$NetBSD: misc.c,v 1.4 1997/01/07 12:42:23 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 #include "pathnames.h"
 
 #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
diff --git a/sail/parties.c b/sail/parties.c
index 7cfe13ba..3fa8c182 100644
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $	*/
+/*	$NetBSD: parties.c,v 1.4 1997/01/07 12:42:23 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)parties.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)parties.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $";
+static char rcsid[] = "$NetBSD: parties.c,v 1.4 1997/01/07 12:42:23 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 meleeing(from, to)
 struct ship *from;
diff --git a/sail/player.h b/sail/player.h
index 15c2fd43..3401290a 100644
--- a/sail/player.h
+++ b/sail/player.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: player.h,v 1.4 1995/04/22 10:37:22 cgd Exp $	*/
+/*	$NetBSD: player.h,v 1.5 1997/01/07 12:42:24 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -32,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)player.h	8.1 (Berkeley) 5/31/93
+ *	@(#)player.h	8.2 (Berkeley) 5/3/95
  */
 
 #include <curses.h>
-#include "externs.h"
+#include "extern.h"
 
 /* sizes and coordinates for the screen */
 
diff --git a/sail/sail.6 b/sail/sail.6
index 4283d82c..2f2db47e 100644
--- a/sail/sail.6
+++ b/sail/sail.6
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sail.6,v 1.5 1996/12/04 00:21:29 perry Exp $
+.\"	$NetBSD: sail.6,v 1.6 1997/01/07 12:42:25 tls Exp $
 .\"
 .\" Copyright (c) 1988, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)sail.6	8.2 (Berkeley) 12/30/93
+.\"	@(#)sail.6	8.3 (Berkeley) 6/1/94
 .\"
-.TH SAIL 6 "December 30, 1993"
+.TH SAIL 6 "June 1, 1994"
 .UC 4
 .SH NAME
 sail \- multi-user wooden ships and iron men
@@ -214,6 +214,7 @@ guns to bear to the left and right sides.  A few guns of small
 aspect (usually 6 or 9 pounders) could point forward, but their
 effect was small compared to a 68 gun broadside of 24 or 32 pounders.
 The guns bear approximately like so:
+.ne 1i
 .nf
 
        \\
@@ -371,6 +372,7 @@ Some of the possible moves for the example above are as follows:
 Because square riggers performed so poorly sailing into the wind, if at
 any point in a movement command you turn into the wind, the movement stops
 there.  E.g.,
+.ne 1i
 .nf
 
 	move (7, 4): l1l4
@@ -418,7 +420,6 @@ the + sign (high pressure) to the - sign (low pressure).  E.g.,
 				|
 				3
 				+
-
 .fi
 .PP
 The wind speeds are 0 = becalmed, 1 = light breeze, 2 = moderate breeze,
@@ -459,6 +460,7 @@ are average, and "Green" and "Mutinous" crews are below average.  A good
 rule of thumb is that "Crack" or "Elite" crews get one extra hit
 per broadside compared to "Mundane" crews.  Don't expect too much from
 "Green" crews.
+.pl -1
 .SH BROADSIDES
 Your two broadsides may be loaded with four kinds of shot: grape, chain,
 round, and double.  You have guns and carronades in both the port and starboard
diff --git a/sail/sync.c b/sail/sync.c
index 20ab46cd..d3389964 100644
--- a/sail/sync.c
+++ b/sail/sync.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sync.c,v 1.4 1995/04/24 12:25:28 cgd Exp $	*/
+/*	$NetBSD: sync.c,v 1.5 1997/01/07 12:42:27 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,15 +35,15 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)sync.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: sync.c,v 1.4 1995/04/24 12:25:28 cgd Exp $";
+static char rcsid[] = "$NetBSD: sync.c,v 1.5 1997/01/07 12:42:27 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
 #include <sys/file.h>
-#include <sys/errno.h>
+#include <errno.h>
+#include "extern.h"
 
 #define BUFSIZE 4096