diff -Naur bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c

--- bsd-games-2.17/boggle/boggle/bog.c	2004-12-07 05:34:21.000000000 -0800

+++ bsd-games-2.17.new/boggle/boggle/bog.c	2006-04-04 14:15:20.000000000 -0700

@@ -336,7 +336,7 @@

 	}

 	while (1) {

-		if (getline(buf) == NULL) {

+		if (xgetline(buf) == NULL) {

 			if (feof(stdin))

 				clearerr(stdin);

 			break;

diff -Naur bsd-games-2.17/boggle/boggle/extern.h bsd-games-2.17.new/boggle/boggle/extern.h

--- bsd-games-2.17/boggle/boggle/extern.h	2004-01-27 12:52:07.000000000 -0800

+++ bsd-games-2.17.new/boggle/boggle/extern.h	2006-04-04 14:15:05.000000000 -0700

@@ -43,7 +43,7 @@

 long	 dictseek(FILE *, long, int);

 void	 findword(void);

 void	 flushin(FILE *);

-char	*getline(char *);

+char	*xgetline(char *);

 void	 getword(char *);

 int	 help(void);

 int	 inputch(void);

diff -Naur bsd-games-2.17/boggle/boggle/mach.c bsd-games-2.17.new/boggle/boggle/mach.c

--- bsd-games-2.17/boggle/boggle/mach.c	2004-12-07 05:34:21.000000000 -0800

+++ bsd-games-2.17.new/boggle/boggle/mach.c	2006-04-04 14:14:43.000000000 -0700

@@ -168,7 +168,7 @@

  * - doesn't accept words longer than MAXWORDLEN or containing caps

  */

 char *

-getline(q)

+xgetline(q)

 	char *q;

 {

 	int ch, done;

diff -Naur bsd-games-2.17/cribbage/cribbage.h bsd-games-2.17.new/cribbage/cribbage.h

--- bsd-games-2.17/cribbage/cribbage.h	2004-02-08 14:29:14.000000000 -0800

+++ bsd-games-2.17.new/cribbage/cribbage.h	2006-04-04 14:11:46.000000000 -0700

@@ -77,7 +77,7 @@

 int	 fifteens(const CARD [], int);

 void	 game(void);

 void	 gamescore(void);

-char	*getline(void);

+char	*xgetline(void);

 int	 getuchar(void);

 int	 incard(CARD *);

 int	 infrom(const CARD [], int, const char *);

diff -Naur bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c

--- bsd-games-2.17/cribbage/crib.c	2004-01-27 12:52:07.000000000 -0800

+++ bsd-games-2.17.new/cribbage/crib.c	2006-04-04 14:11:05.000000000 -0700

@@ -221,7 +221,7 @@

 			if (!rflag) {			/* player cuts deck */

 				msg(quiet ? "Cut for crib? " :

 			    "Cut to see whose crib it is -- low card wins? ");

-				getline();

+				xgetline();

 			}

 			i = (rand() >> 4) % CARDS;	/* random cut */

 			do {	/* comp cuts deck */

@@ -397,7 +397,7 @@

 		if (!rflag) {	/* random cut */

 			msg(quiet ? "Cut the deck? " :

 		    "How many cards down do you wish to cut the deck? ");

-			getline();

+			xgetline();

 		}

 		i = (rand() >> 4) % (CARDS - pos);

 		turnover = deck[i + pos];

diff -Naur bsd-games-2.17/cribbage/io.c bsd-games-2.17.new/cribbage/io.c

--- bsd-games-2.17/cribbage/io.c	2004-12-07 05:34:21.000000000 -0800

+++ bsd-games-2.17.new/cribbage/io.c	2006-04-04 14:11:05.000000000 -0700

@@ -245,7 +245,7 @@

 	retval = FALSE;

 	rnk = sut = EMPTY;

-	if (!(line = getline()))

+	if (!(line = xgetline()))

 		goto gotit;

 	p = p1 = line;

 	while (*p1 != ' ' && *p1 != '\0')

@@ -346,7 +346,7 @@

 	for (sum = 0;;) {

 		msg(prompt);

-		if (!(p = getline()) || *p == '\0') {

+		if (!(p = xgetline()) || *p == '\0') {

 			msg(quiet ? "Not a number" :

 			    "That doesn't look like a number");

 			continue;

@@ -528,12 +528,12 @@

 }

 /*

- * getline:

+ * xgetline:

  *      Reads the next line up to '\n' or EOF.  Multiple spaces are

  *	compressed to one space; a space is inserted before a ','

  */

 char *

-getline()

+xgetline()

 {

 	char *sp;

 	int c, oy, ox;

diff -Naur bsd-games-2.17/gomoku/bdisp.c bsd-games-2.17.new/gomoku/bdisp.c

--- bsd-games-2.17/gomoku/bdisp.c	2003-12-16 18:47:37.000000000 -0800

+++ bsd-games-2.17.new/gomoku/bdisp.c	2006-04-04 14:11:05.000000000 -0700

@@ -241,7 +241,7 @@

 }

 int

-getline(buf, size)

+xgetline(buf, size)

 	char *buf;

 	int size;

 {

diff -Naur bsd-games-2.17/gomoku/gomoku.h bsd-games-2.17.new/gomoku/gomoku.h

--- bsd-games-2.17/gomoku/gomoku.h	2004-01-27 12:52:07.000000000 -0800

+++ bsd-games-2.17.new/gomoku/gomoku.h	2006-04-04 14:12:15.000000000 -0700

@@ -263,7 +263,7 @@

 void	bdinit(struct spotstr *);

 void	init_overlap(void);

-int	getline(char *, int);

+int	xgetline(char *, int);

 void	ask(const char *);

 void	dislog(const char *);

 void	bdump(FILE *);

diff -Naur bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c

--- bsd-games-2.17/gomoku/main.c	2004-01-27 12:52:07.000000000 -0800

+++ bsd-games-2.17.new/gomoku/main.c	2006-04-04 14:11:05.000000000 -0700

@@ -155,7 +155,7 @@

 		if (inputfp == NULL && test == 0) {

 			for (;;) {

 				ask("black or white? ");

-				getline(buf, sizeof(buf));

+				xgetline(buf, sizeof(buf));

 				if (buf[0] == 'b' || buf[0] == 'B') {

 					color = BLACK;

 					break;

@@ -172,7 +172,7 @@

 		}

 	} else {

 		setbuf(stdout, 0);

-		getline(buf, sizeof(buf));

+		xgetline(buf, sizeof(buf));

 		if (strcmp(buf, "black") == 0)

 			color = BLACK;

 		else if (strcmp(buf, "white") == 0)

@@ -244,7 +244,7 @@

 		getinput:

 			if (interactive)

 				ask("move? ");

-			if (!getline(buf, sizeof(buf))) {

+			if (!xgetline(buf, sizeof(buf))) {

 				curmove = RESIGN;

 				break;

 			}

@@ -256,7 +256,7 @@

 					FILE *fp;

 					ask("save file name? ");

-					(void)getline(buf, sizeof(buf));

+					(void)xgetline(buf, sizeof(buf));

 					if ((fp = fopen(buf, "w")) == NULL) {

 						glog("cannot create save file");

 						goto getinput;

@@ -309,14 +309,14 @@

 		if (i != RESIGN) {

 		replay:

 			ask("replay? ");

-			if (getline(buf, sizeof(buf)) &&

+			if (xgetline(buf, sizeof(buf)) &&

 			    (buf[0] == 'y' || buf[0] == 'Y'))

 				goto again;

 			if (strcmp(buf, "save") == 0) {

 				FILE *fp;

 				ask("save file name? ");

-				(void)getline(buf, sizeof(buf));

+				(void)xgetline(buf, sizeof(buf));

 				if ((fp = fopen(buf, "w")) == NULL) {

 					glog("cannot create save file");

 					goto replay;

@@ -367,7 +367,7 @@

 		quit();

 top:

 	ask("cmd? ");

-	if (!getline(fmtbuf, sizeof(fmtbuf)))

+	if (!xgetline(fmtbuf, sizeof(fmtbuf)))

 		quit();

 	switch (*fmtbuf) {

 	case '\0':