1 diff -Naur bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.1/boggle/boggle/bog.c
2 --- bsd-games-2.17/boggle/boggle/bog.c 2004-12-07 07:34:21.000000000 -0600
3 +++ bsd-games-2.17.1/boggle/boggle/bog.c 2010-05-22 10:51:23.000000000 -0500
8 - if (getline(buf) == NULL) {
9 + if (boggle_getline(buf) == NULL) {
13 diff -Naur bsd-games-2.17/boggle/boggle/extern.h bsd-games-2.17.1/boggle/boggle/extern.h
14 --- bsd-games-2.17/boggle/boggle/extern.h 2004-01-27 14:52:07.000000000 -0600
15 +++ bsd-games-2.17.1/boggle/boggle/extern.h 2010-05-22 10:51:23.000000000 -0500
17 long dictseek(FILE *, long, int);
20 -char *getline(char *);
21 +char *boggle_getline(char *);
25 diff -Naur bsd-games-2.17/boggle/boggle/mach.c bsd-games-2.17.1/boggle/boggle/mach.c
26 --- bsd-games-2.17/boggle/boggle/mach.c 2004-12-07 07:34:21.000000000 -0600
27 +++ bsd-games-2.17.1/boggle/boggle/mach.c 2010-05-22 10:51:23.000000000 -0500
29 * - doesn't accept words longer than MAXWORDLEN or containing caps
37 diff -Naur bsd-games-2.17/cribbage/cribbage.h bsd-games-2.17.1/cribbage/cribbage.h
38 --- bsd-games-2.17/cribbage/cribbage.h 2004-02-08 16:29:14.000000000 -0600
39 +++ bsd-games-2.17.1/cribbage/cribbage.h 2010-05-22 10:51:23.000000000 -0500
41 int fifteens(const CARD [], int);
45 +char *cribbage_getline(void);
48 int infrom(const CARD [], int, const char *);
49 diff -Naur bsd-games-2.17/cribbage/crib.c bsd-games-2.17.1/cribbage/crib.c
50 --- bsd-games-2.17/cribbage/crib.c 2004-01-27 14:52:07.000000000 -0600
51 +++ bsd-games-2.17.1/cribbage/crib.c 2010-05-22 10:51:23.000000000 -0500
53 if (!rflag) { /* player cuts deck */
54 msg(quiet ? "Cut for crib? " :
55 "Cut to see whose crib it is -- low card wins? ");
59 i = (rand() >> 4) % CARDS; /* random cut */
60 do { /* comp cuts deck */
62 if (!rflag) { /* random cut */
63 msg(quiet ? "Cut the deck? " :
64 "How many cards down do you wish to cut the deck? ");
68 i = (rand() >> 4) % (CARDS - pos);
69 turnover = deck[i + pos];
70 diff -Naur bsd-games-2.17/cribbage/io.c bsd-games-2.17.1/cribbage/io.c
71 --- bsd-games-2.17/cribbage/io.c 2004-12-07 07:34:21.000000000 -0600
72 +++ bsd-games-2.17.1/cribbage/io.c 2010-05-22 10:51:23.000000000 -0500
77 - if (!(line = getline()))
78 + if (!(line = cribbage_getline()))
81 while (*p1 != ' ' && *p1 != '\0')
86 - if (!(p = getline()) || *p == '\0') {
87 + if (!(p = cribbage_getline()) || *p == '\0') {
88 msg(quiet ? "Not a number" :
89 "That doesn't look like a number");
97 * Reads the next line up to '\n' or EOF. Multiple spaces are
98 * compressed to one space; a space is inserted before a ','
106 diff -Naur bsd-games-2.17/gomoku/bdisp.c bsd-games-2.17.1/gomoku/bdisp.c
107 --- bsd-games-2.17/gomoku/bdisp.c 2003-12-16 20:47:37.000000000 -0600
108 +++ bsd-games-2.17.1/gomoku/bdisp.c 2010-05-22 10:51:23.000000000 -0500
114 +gomoku_getline(buf, size)
118 diff -Naur bsd-games-2.17/gomoku/gomoku.h bsd-games-2.17.1/gomoku/gomoku.h
119 --- bsd-games-2.17/gomoku/gomoku.h 2004-01-27 14:52:07.000000000 -0600
120 +++ bsd-games-2.17.1/gomoku/gomoku.h 2010-05-22 10:51:23.000000000 -0500
123 void bdinit(struct spotstr *);
124 void init_overlap(void);
125 -int getline(char *, int);
126 +int gomoku_getline(char *, int);
127 void ask(const char *);
128 void dislog(const char *);
130 diff -Naur bsd-games-2.17/gomoku/main.c bsd-games-2.17.1/gomoku/main.c
131 --- bsd-games-2.17/gomoku/main.c 2004-01-27 14:52:07.000000000 -0600
132 +++ bsd-games-2.17.1/gomoku/main.c 2010-05-22 10:51:23.000000000 -0500
134 if (inputfp == NULL && test == 0) {
136 ask("black or white? ");
137 - getline(buf, sizeof(buf));
138 + gomoku_getline(buf, sizeof(buf));
139 if (buf[0] == 'b' || buf[0] == 'B') {
146 - getline(buf, sizeof(buf));
147 + gomoku_getline(buf, sizeof(buf));
148 if (strcmp(buf, "black") == 0)
150 else if (strcmp(buf, "white") == 0)
155 - if (!getline(buf, sizeof(buf))) {
156 + if (!gomoku_getline(buf, sizeof(buf))) {
163 ask("save file name? ");
164 - (void)getline(buf, sizeof(buf));
165 + (void)gomoku_getline(buf, sizeof(buf));
166 if ((fp = fopen(buf, "w")) == NULL) {
167 glog("cannot create save file");
169 @@ -309,14 +309,14 @@
173 - if (getline(buf, sizeof(buf)) &&
174 + if (gomoku_getline(buf, sizeof(buf)) &&
175 (buf[0] == 'y' || buf[0] == 'Y'))
177 if (strcmp(buf, "save") == 0) {
180 ask("save file name? ");
181 - (void)getline(buf, sizeof(buf));
182 + (void)gomoku_getline(buf, sizeof(buf));
183 if ((fp = fopen(buf, "w")) == NULL) {
184 glog("cannot create save file");
190 - if (!getline(fmtbuf, sizeof(fmtbuf)))
191 + if (!gomoku_getline(fmtbuf, sizeof(fmtbuf)))