|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/boggle/boggle/bog.c 2004-12-07 05:34:21.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/boggle/boggle/bog.c 2006-04-04 14:15:20.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -336,7 +336,7 @@
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
while (1) {
|
|
Michael Thomas |
cc5a4cd |
- if (getline(buf) == NULL) {
|
|
Michael Thomas |
cc5a4cd |
+ if (xgetline(buf) == NULL) {
|
|
Michael Thomas |
cc5a4cd |
if (feof(stdin))
|
|
Michael Thomas |
cc5a4cd |
clearerr(stdin);
|
|
Michael Thomas |
cc5a4cd |
break;
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/boggle/boggle/extern.h bsd-games-2.17.new/boggle/boggle/extern.h
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/boggle/boggle/extern.h 2004-01-27 12:52:07.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/boggle/boggle/extern.h 2006-04-04 14:15:05.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -43,7 +43,7 @@
|
|
Michael Thomas |
cc5a4cd |
long dictseek(FILE *, long, int);
|
|
Michael Thomas |
cc5a4cd |
void findword(void);
|
|
Michael Thomas |
cc5a4cd |
void flushin(FILE *);
|
|
Michael Thomas |
cc5a4cd |
-char *getline(char *);
|
|
Michael Thomas |
cc5a4cd |
+char *xgetline(char *);
|
|
Michael Thomas |
cc5a4cd |
void getword(char *);
|
|
Michael Thomas |
cc5a4cd |
int help(void);
|
|
Michael Thomas |
cc5a4cd |
int inputch(void);
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/boggle/boggle/mach.c bsd-games-2.17.new/boggle/boggle/mach.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/boggle/boggle/mach.c 2004-12-07 05:34:21.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/boggle/boggle/mach.c 2006-04-04 14:14:43.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -168,7 +168,7 @@
|
|
Michael Thomas |
cc5a4cd |
* - doesn't accept words longer than MAXWORDLEN or containing caps
|
|
Michael Thomas |
cc5a4cd |
*/
|
|
Michael Thomas |
cc5a4cd |
char *
|
|
Michael Thomas |
cc5a4cd |
-getline(q)
|
|
Michael Thomas |
cc5a4cd |
+xgetline(q)
|
|
Michael Thomas |
cc5a4cd |
char *q;
|
|
Michael Thomas |
cc5a4cd |
{
|
|
Michael Thomas |
cc5a4cd |
int ch, done;
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/cribbage/cribbage.h bsd-games-2.17.new/cribbage/cribbage.h
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/cribbage/cribbage.h 2004-02-08 14:29:14.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/cribbage/cribbage.h 2006-04-04 14:11:46.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -77,7 +77,7 @@
|
|
Michael Thomas |
cc5a4cd |
int fifteens(const CARD [], int);
|
|
Michael Thomas |
cc5a4cd |
void game(void);
|
|
Michael Thomas |
cc5a4cd |
void gamescore(void);
|
|
Michael Thomas |
cc5a4cd |
-char *getline(void);
|
|
Michael Thomas |
cc5a4cd |
+char *xgetline(void);
|
|
Michael Thomas |
cc5a4cd |
int getuchar(void);
|
|
Michael Thomas |
cc5a4cd |
int incard(CARD *);
|
|
Michael Thomas |
cc5a4cd |
int infrom(const CARD [], int, const char *);
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/cribbage/crib.c 2004-01-27 12:52:07.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/cribbage/crib.c 2006-04-04 14:11:05.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -221,7 +221,7 @@
|
|
Michael Thomas |
cc5a4cd |
if (!rflag) { /* player cuts deck */
|
|
Michael Thomas |
cc5a4cd |
msg(quiet ? "Cut for crib? " :
|
|
Michael Thomas |
cc5a4cd |
"Cut to see whose crib it is -- low card wins? ");
|
|
Michael Thomas |
cc5a4cd |
- getline();
|
|
Michael Thomas |
cc5a4cd |
+ xgetline();
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
i = (rand() >> 4) % CARDS; /* random cut */
|
|
Michael Thomas |
cc5a4cd |
do { /* comp cuts deck */
|
|
Michael Thomas |
cc5a4cd |
@@ -397,7 +397,7 @@
|
|
Michael Thomas |
cc5a4cd |
if (!rflag) { /* random cut */
|
|
Michael Thomas |
cc5a4cd |
msg(quiet ? "Cut the deck? " :
|
|
Michael Thomas |
cc5a4cd |
"How many cards down do you wish to cut the deck? ");
|
|
Michael Thomas |
cc5a4cd |
- getline();
|
|
Michael Thomas |
cc5a4cd |
+ xgetline();
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
i = (rand() >> 4) % (CARDS - pos);
|
|
Michael Thomas |
cc5a4cd |
turnover = deck[i + pos];
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/cribbage/io.c bsd-games-2.17.new/cribbage/io.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/cribbage/io.c 2004-12-07 05:34:21.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/cribbage/io.c 2006-04-04 14:11:05.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -245,7 +245,7 @@
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
retval = FALSE;
|
|
Michael Thomas |
cc5a4cd |
rnk = sut = EMPTY;
|
|
Michael Thomas |
cc5a4cd |
- if (!(line = getline()))
|
|
Michael Thomas |
cc5a4cd |
+ if (!(line = xgetline()))
|
|
Michael Thomas |
cc5a4cd |
goto gotit;
|
|
Michael Thomas |
cc5a4cd |
p = p1 = line;
|
|
Michael Thomas |
cc5a4cd |
while (*p1 != ' ' && *p1 != '\0')
|
|
Michael Thomas |
cc5a4cd |
@@ -346,7 +346,7 @@
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
for (sum = 0;;) {
|
|
Michael Thomas |
cc5a4cd |
msg(prompt);
|
|
Michael Thomas |
cc5a4cd |
- if (!(p = getline()) || *p == '\0') {
|
|
Michael Thomas |
cc5a4cd |
+ if (!(p = xgetline()) || *p == '\0') {
|
|
Michael Thomas |
cc5a4cd |
msg(quiet ? "Not a number" :
|
|
Michael Thomas |
cc5a4cd |
"That doesn't look like a number");
|
|
Michael Thomas |
cc5a4cd |
continue;
|
|
Michael Thomas |
cc5a4cd |
@@ -528,12 +528,12 @@
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
/*
|
|
Michael Thomas |
cc5a4cd |
- * getline:
|
|
Michael Thomas |
cc5a4cd |
+ * xgetline:
|
|
Michael Thomas |
cc5a4cd |
* Reads the next line up to '\n' or EOF. Multiple spaces are
|
|
Michael Thomas |
cc5a4cd |
* compressed to one space; a space is inserted before a ','
|
|
Michael Thomas |
cc5a4cd |
*/
|
|
Michael Thomas |
cc5a4cd |
char *
|
|
Michael Thomas |
cc5a4cd |
-getline()
|
|
Michael Thomas |
cc5a4cd |
+xgetline()
|
|
Michael Thomas |
cc5a4cd |
{
|
|
Michael Thomas |
cc5a4cd |
char *sp;
|
|
Michael Thomas |
cc5a4cd |
int c, oy, ox;
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/gomoku/bdisp.c bsd-games-2.17.new/gomoku/bdisp.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/gomoku/bdisp.c 2003-12-16 18:47:37.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/gomoku/bdisp.c 2006-04-04 14:11:05.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -241,7 +241,7 @@
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
int
|
|
Michael Thomas |
cc5a4cd |
-getline(buf, size)
|
|
Michael Thomas |
cc5a4cd |
+xgetline(buf, size)
|
|
Michael Thomas |
cc5a4cd |
char *buf;
|
|
Michael Thomas |
cc5a4cd |
int size;
|
|
Michael Thomas |
cc5a4cd |
{
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/gomoku/gomoku.h bsd-games-2.17.new/gomoku/gomoku.h
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/gomoku/gomoku.h 2004-01-27 12:52:07.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/gomoku/gomoku.h 2006-04-04 14:12:15.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -263,7 +263,7 @@
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
void bdinit(struct spotstr *);
|
|
Michael Thomas |
cc5a4cd |
void init_overlap(void);
|
|
Michael Thomas |
cc5a4cd |
-int getline(char *, int);
|
|
Michael Thomas |
cc5a4cd |
+int xgetline(char *, int);
|
|
Michael Thomas |
cc5a4cd |
void ask(const char *);
|
|
Michael Thomas |
cc5a4cd |
void dislog(const char *);
|
|
Michael Thomas |
cc5a4cd |
void bdump(FILE *);
|
|
Michael Thomas |
cc5a4cd |
diff -Naur bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c
|
|
Michael Thomas |
cc5a4cd |
--- bsd-games-2.17/gomoku/main.c 2004-01-27 12:52:07.000000000 -0800
|
|
Michael Thomas |
cc5a4cd |
+++ bsd-games-2.17.new/gomoku/main.c 2006-04-04 14:11:05.000000000 -0700
|
|
Michael Thomas |
cc5a4cd |
@@ -155,7 +155,7 @@
|
|
Michael Thomas |
cc5a4cd |
if (inputfp == NULL && test == 0) {
|
|
Michael Thomas |
cc5a4cd |
for (;;) {
|
|
Michael Thomas |
cc5a4cd |
ask("black or white? ");
|
|
Michael Thomas |
cc5a4cd |
- getline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
+ xgetline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
if (buf[0] == 'b' || buf[0] == 'B') {
|
|
Michael Thomas |
cc5a4cd |
color = BLACK;
|
|
Michael Thomas |
cc5a4cd |
break;
|
|
Michael Thomas |
cc5a4cd |
@@ -172,7 +172,7 @@
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
} else {
|
|
Michael Thomas |
cc5a4cd |
setbuf(stdout, 0);
|
|
Michael Thomas |
cc5a4cd |
- getline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
+ xgetline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
if (strcmp(buf, "black") == 0)
|
|
Michael Thomas |
cc5a4cd |
color = BLACK;
|
|
Michael Thomas |
cc5a4cd |
else if (strcmp(buf, "white") == 0)
|
|
Michael Thomas |
cc5a4cd |
@@ -244,7 +244,7 @@
|
|
Michael Thomas |
cc5a4cd |
getinput:
|
|
Michael Thomas |
cc5a4cd |
if (interactive)
|
|
Michael Thomas |
cc5a4cd |
ask("move? ");
|
|
Michael Thomas |
cc5a4cd |
- if (!getline(buf, sizeof(buf))) {
|
|
Michael Thomas |
cc5a4cd |
+ if (!xgetline(buf, sizeof(buf))) {
|
|
Michael Thomas |
cc5a4cd |
curmove = RESIGN;
|
|
Michael Thomas |
cc5a4cd |
break;
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
@@ -256,7 +256,7 @@
|
|
Michael Thomas |
cc5a4cd |
FILE *fp;
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
ask("save file name? ");
|
|
Michael Thomas |
cc5a4cd |
- (void)getline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
+ (void)xgetline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
if ((fp = fopen(buf, "w")) == NULL) {
|
|
Michael Thomas |
cc5a4cd |
glog("cannot create save file");
|
|
Michael Thomas |
cc5a4cd |
goto getinput;
|
|
Michael Thomas |
cc5a4cd |
@@ -309,14 +309,14 @@
|
|
Michael Thomas |
cc5a4cd |
if (i != RESIGN) {
|
|
Michael Thomas |
cc5a4cd |
replay:
|
|
Michael Thomas |
cc5a4cd |
ask("replay? ");
|
|
Michael Thomas |
cc5a4cd |
- if (getline(buf, sizeof(buf)) &&
|
|
Michael Thomas |
cc5a4cd |
+ if (xgetline(buf, sizeof(buf)) &&
|
|
Michael Thomas |
cc5a4cd |
(buf[0] == 'y' || buf[0] == 'Y'))
|
|
Michael Thomas |
cc5a4cd |
goto again;
|
|
Michael Thomas |
cc5a4cd |
if (strcmp(buf, "save") == 0) {
|
|
Michael Thomas |
cc5a4cd |
FILE *fp;
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
ask("save file name? ");
|
|
Michael Thomas |
cc5a4cd |
- (void)getline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
+ (void)xgetline(buf, sizeof(buf));
|
|
Michael Thomas |
cc5a4cd |
if ((fp = fopen(buf, "w")) == NULL) {
|
|
Michael Thomas |
cc5a4cd |
glog("cannot create save file");
|
|
Michael Thomas |
cc5a4cd |
goto replay;
|
|
Michael Thomas |
cc5a4cd |
@@ -367,7 +367,7 @@
|
|
Michael Thomas |
cc5a4cd |
quit();
|
|
Michael Thomas |
cc5a4cd |
top:
|
|
Michael Thomas |
cc5a4cd |
ask("cmd? ");
|
|
Michael Thomas |
cc5a4cd |
- if (!getline(fmtbuf, sizeof(fmtbuf)))
|
|
Michael Thomas |
cc5a4cd |
+ if (!xgetline(fmtbuf, sizeof(fmtbuf)))
|
|
Michael Thomas |
cc5a4cd |
quit();
|
|
Michael Thomas |
cc5a4cd |
switch (*fmtbuf) {
|
|
Michael Thomas |
cc5a4cd |
case '\0':
|