|
 |
d53ced3 |
--- bsd-games-2.17/battlestar/room.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
d53ced3 |
+++ bsd-games-2.17/battlestar/room.c 2017-05-18 18:07:39.212393764 -0700
|
|
|
d53ced3 |
@@ -58,7 +58,7 @@
|
|
|
d53ced3 |
putchar(c);
|
|
|
d53ced3 |
} else {
|
|
|
d53ced3 |
if (c != '*')
|
|
|
d53ced3 |
- printf(truedirec(compass, c));
|
|
|
d53ced3 |
+ printf("%s", truedirec(compass, c));
|
|
|
d53ced3 |
compass++;
|
|
|
d53ced3 |
}
|
|
|
d53ced3 |
}
|
|
|
a440437 |
--- bsd-games-2.17/cribbage/io.c.orig 2017-05-18 18:20:38.416305677 -0700
|
|
|
a440437 |
+++ bsd-games-2.17/cribbage/io.c 2017-05-18 18:44:40.525540333 -0700
|
|
|
a440437 |
@@ -103,13 +103,13 @@
|
|
|
a440437 |
if (brfrank)
|
|
|
a440437 |
addmsg("%1.1s", rankchar[c.rank]);
|
|
|
a440437 |
else
|
|
|
a440437 |
- addmsg(rankname[c.rank]);
|
|
|
a440437 |
+ addmsg("%s", rankname[c.rank]);
|
|
|
a440437 |
if (mid != NULL)
|
|
|
a440437 |
- addmsg(mid);
|
|
|
a440437 |
+ addmsg("%s", mid);
|
|
|
a440437 |
if (brfsuit)
|
|
|
a440437 |
addmsg("%1.1s", suitchar[c.suit]);
|
|
|
a440437 |
else
|
|
|
a440437 |
- addmsg(suitname[c.suit]);
|
|
|
a440437 |
+ addmsg("%s", suitname[c.suit]);
|
|
|
a440437 |
return (TRUE);
|
|
|
a440437 |
}
|
|
|
a440437 |
|
|
|
a440437 |
@@ -192,7 +192,7 @@
|
|
|
a440437 |
exit(74);
|
|
|
a440437 |
}
|
|
|
a440437 |
for (;;) {
|
|
|
a440437 |
- msg(prompt);
|
|
|
a440437 |
+ msg("%s", prompt);
|
|
|
a440437 |
if (incard(&crd)) { /* if card is full card */
|
|
|
a440437 |
if (!is_one(crd, hand, n))
|
|
|
a440437 |
msg("That's not in your hand");
|
|
|
a440437 |
@@ -345,7 +345,7 @@
|
|
|
a440437 |
int sum;
|
|
|
a440437 |
|
|
|
a440437 |
for (sum = 0;;) {
|
|
|
a440437 |
- msg(prompt);
|
|
|
a440437 |
+ msg("%s", prompt);
|
|
|
a440437 |
if (!(p = xgetline()) || *p == '\0') {
|
|
|
a440437 |
msg(quiet ? "Not a number" :
|
|
|
a440437 |
"That doesn't look like a number");
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.apply.c.orig 2004-01-27 12:52:07.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.apply.c 2017-05-18 18:47:57.690735298 -0700
|
|
|
a440437 |
@@ -392,7 +392,7 @@
|
|
|
a440437 |
digtxt = "Now what exactly was it that you were digging in?";
|
|
|
a440437 |
mnewsym(dpx, dpy);
|
|
|
a440437 |
prl(dpx, dpy);
|
|
|
a440437 |
- pline(digtxt); /* after mnewsym & prl */
|
|
|
a440437 |
+ pline("%s", digtxt); /* after mnewsym & prl */
|
|
|
a440437 |
return (0);
|
|
|
a440437 |
} else {
|
|
|
a440437 |
if (IS_WALL(levl[dpx][dpy].typ)) {
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.eat.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.eat.c 2017-05-18 18:48:58.618413276 -0700
|
|
|
a440437 |
@@ -132,7 +132,7 @@
|
|
|
a440437 |
useup(tin.tin);
|
|
|
a440437 |
r = rn2(2 * TTSZ);
|
|
|
a440437 |
if (r < TTSZ) {
|
|
|
a440437 |
- pline(tintxts[r].txt);
|
|
|
a440437 |
+ pline("%s", tintxts[r].txt);
|
|
|
a440437 |
lesshungry(tintxts[r].nut);
|
|
|
a440437 |
if (r == 1) { /* SALMON */
|
|
|
a440437 |
Glib = rnd(15);
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.end.c.orig 2017-05-18 18:20:38.432305860 -0700
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.end.c 2017-05-18 21:23:05.962841955 -0700
|
|
|
a440437 |
@@ -539,7 +539,7 @@
|
|
|
a440437 |
if (t1->maxlvl != t1->level)
|
|
|
a440437 |
Sprintf(eos(linebuf), " [max %d]", t1->maxlvl);
|
|
|
a440437 |
if (quit && t1->death[4])
|
|
|
a440437 |
- Sprintf(eos(linebuf), t1->death + 4);
|
|
|
a440437 |
+ Sprintf(eos(linebuf), "%s", t1->death + 4);
|
|
|
a440437 |
}
|
|
|
a440437 |
if (killed)
|
|
|
a440437 |
Sprintf(eos(linebuf), " by %s%s",
|
|
|
a440437 |
@@ -552,7 +552,7 @@
|
|
|
a440437 |
char *bp = eos(linebuf);
|
|
|
a440437 |
char hpbuf[10];
|
|
|
a440437 |
int hppos;
|
|
|
a440437 |
- Sprintf(hpbuf, (t1->hp > 0) ? itoa(t1->hp) : "-");
|
|
|
a440437 |
+ Sprintf(hpbuf, "%s", (t1->hp > 0) ? itoa(t1->hp) : "-");
|
|
|
a440437 |
hppos = COLNO - 7 - strlen(hpbuf);
|
|
|
a440437 |
if (bp <= linebuf + hppos) {
|
|
|
a440437 |
while (bp < linebuf + hppos)
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.invent.c.orig 2004-01-27 12:52:07.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.invent.c 2017-05-18 21:24:59.807943020 -0700
|
|
|
a440437 |
@@ -671,7 +671,7 @@
|
|
|
a440437 |
if (ckfn && !(*ckfn) (otmp))
|
|
|
a440437 |
continue;
|
|
|
a440437 |
if (!allflag) {
|
|
|
a440437 |
- pline(xprname(otmp, ilet));
|
|
|
a440437 |
+ pline("%s", xprname(otmp, ilet));
|
|
|
a440437 |
addtopl(" [nyaq]? ");
|
|
|
a440437 |
sym = readchar();
|
|
|
a440437 |
} else
|
|
|
a440437 |
@@ -717,7 +717,7 @@
|
|
|
a440437 |
prinv(obj)
|
|
|
a440437 |
struct obj *obj;
|
|
|
a440437 |
{
|
|
|
a440437 |
- pline(xprname(obj, obj_to_let(obj)));
|
|
|
a440437 |
+ pline("%s", xprname(obj, obj_to_let(obj)));
|
|
|
a440437 |
}
|
|
|
a440437 |
|
|
|
a440437 |
static char *
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.main.c.orig 2017-05-18 18:20:38.432305860 -0700
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.main.c 2017-05-18 21:25:43.616351447 -0700
|
|
|
a440437 |
@@ -463,7 +463,7 @@
|
|
|
a440437 |
}
|
|
|
a440437 |
if (multi < 0) {
|
|
|
a440437 |
if (!++multi) {
|
|
|
a440437 |
- pline(nomovemsg ? nomovemsg :
|
|
|
a440437 |
+ pline("%s", nomovemsg ? nomovemsg :
|
|
|
a440437 |
"You can move again.");
|
|
|
a440437 |
nomovemsg = 0;
|
|
|
a440437 |
if (afternmv)
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.options.c.orig 2004-01-02 10:04:51.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.options.c 2017-05-18 21:26:27.148753037 -0700
|
|
|
a440437 |
@@ -268,7 +268,7 @@
|
|
|
a440437 |
if (*--eop == ',')
|
|
|
a440437 |
*eop = 0;
|
|
|
a440437 |
}
|
|
|
a440437 |
- pline(buf);
|
|
|
a440437 |
+ pline("%s", buf);
|
|
|
a440437 |
} else
|
|
|
a440437 |
parseoptions(buf, FALSE);
|
|
|
a440437 |
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.pager.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.pager.c 2017-05-18 21:28:03.938647785 -0700
|
|
|
a440437 |
@@ -104,7 +104,7 @@
|
|
|
a440437 |
buf[0] = q;
|
|
|
a440437 |
(void) strncpy(buf + 1, " ", 7);
|
|
|
a440437 |
}
|
|
|
a440437 |
- pline(buf);
|
|
|
a440437 |
+ pline("%s", buf);
|
|
|
a440437 |
if (ep[-1] == ';') {
|
|
|
a440437 |
pline("More info? ");
|
|
|
a440437 |
if (readchar() == 'y') {
|
|
|
a440437 |
@@ -298,7 +298,7 @@
|
|
|
a440437 |
}
|
|
|
a440437 |
/* --- now we really do it --- */
|
|
|
a440437 |
if (mode == 2 && linect == 1) /* topline only */
|
|
|
a440437 |
- pline(texthead->line_text);
|
|
|
a440437 |
+ pline("%s", texthead->line_text);
|
|
|
a440437 |
else if (mode == 2) {
|
|
|
a440437 |
int curline, lth;
|
|
|
a440437 |
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.potion.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.potion.c 2017-05-18 21:27:13.934185215 -0700
|
|
|
a440437 |
@@ -286,7 +286,7 @@
|
|
|
a440437 |
if (flags.beginner)
|
|
|
a440437 |
pline("You have a strange feeling for a moment, then it passes.");
|
|
|
a440437 |
else
|
|
|
a440437 |
- pline(txt);
|
|
|
a440437 |
+ pline("%s", txt);
|
|
|
a440437 |
if (!objects[obj->otyp].oc_name_known && !objects[obj->otyp].oc_uname)
|
|
|
a440437 |
docall(obj);
|
|
|
a440437 |
useup(obj);
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.rumors.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.rumors.c 2017-05-18 21:28:46.907045804 -0700
|
|
|
a440437 |
@@ -112,7 +112,7 @@
|
|
|
a440437 |
if ((ep = strchr(line, '\n')) != 0)
|
|
|
a440437 |
*ep = 0;
|
|
|
a440437 |
pline("This cookie has a scrap of paper inside! It reads: ");
|
|
|
a440437 |
- pline(line);
|
|
|
a440437 |
+ pline("%s", line);
|
|
|
a440437 |
}
|
|
|
a440437 |
|
|
|
a440437 |
void
|
|
|
a440437 |
--- bsd-games-2.17/hack/hack.timeout.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
a440437 |
+++ bsd-games-2.17/hack/hack.timeout.c 2017-05-18 21:29:57.511700875 -0700
|
|
|
a440437 |
@@ -126,7 +126,7 @@
|
|
|
a440437 |
long i = (Stoned & TIMEOUT);
|
|
|
a440437 |
|
|
|
a440437 |
if (i > 0 && i <= SIZE(stoned_texts))
|
|
|
a440437 |
- pline(stoned_texts[SIZE(stoned_texts) - i]);
|
|
|
a440437 |
+ pline("%s", stoned_texts[SIZE(stoned_texts) - i]);
|
|
|
a440437 |
if (i == 5)
|
|
|
a440437 |
Fast = 0;
|
|
|
a440437 |
if (i == 3)
|
|
|
3391ea6 |
--- bsd-games-2.17/hunt/hunt/hunt.c.orig 2017-05-18 21:38:16.488366136 -0700
|
|
|
3391ea6 |
+++ bsd-games-2.17/hunt/hunt/hunt.c 2017-05-18 21:52:37.700549544 -0700
|
|
|
3391ea6 |
@@ -914,7 +914,7 @@
|
|
|
3391ea6 |
int serrno = errno;
|
|
|
3391ea6 |
fincurs();
|
|
|
3391ea6 |
errno = serrno;
|
|
|
3391ea6 |
- err(eval, mesg ? mesg : "");
|
|
|
3391ea6 |
+ err(eval, "%s", mesg ? mesg : "");
|
|
|
3391ea6 |
}
|
|
|
3391ea6 |
|
|
|
3391ea6 |
/*
|
|
|
3391ea6 |
@@ -928,7 +928,7 @@
|
|
|
3391ea6 |
const char *mesg;
|
|
|
3391ea6 |
{
|
|
|
3391ea6 |
fincurs();
|
|
|
3391ea6 |
- errx(eval, mesg ? mesg : "");
|
|
|
3391ea6 |
+ errx(eval, "%s", mesg ? mesg : "");
|
|
|
3391ea6 |
}
|
|
|
3391ea6 |
|
|
|
3391ea6 |
#if !defined(USE_CURSES) && defined(SIGTSTP)
|
|
|
3391ea6 |
--- bsd-games-2.17/monop/misc.c.orig 2004-12-07 05:34:21.000000000 -0800
|
|
|
3391ea6 |
+++ bsd-games-2.17/monop/misc.c 2017-05-18 21:53:32.207072459 -0700
|
|
|
3391ea6 |
@@ -101,7 +101,7 @@
|
|
|
3391ea6 |
|
|
|
3391ea6 |
for (;;) {
|
|
|
3391ea6 |
inter:
|
|
|
3391ea6 |
- printf(prompt);
|
|
|
3391ea6 |
+ printf("%s", prompt);
|
|
|
3391ea6 |
num = 0;
|
|
|
3391ea6 |
for (sp = buf; (c=getchar()) != '\n'; *sp++ = c)
|
|
|
3391ea6 |
if (c == -1) /* check for interrupted system call */
|
|
|
8292759 |
--- bsd-games-2.17/sail/assorted.c.orig 2003-12-16 18:47:37.000000000 -0800
|
|
|
8292759 |
+++ bsd-games-2.17/sail/assorted.c 2017-05-18 22:10:27.624338039 -0700
|
|
|
8292759 |
@@ -163,7 +163,7 @@
|
|
|
8292759 |
errx(1, "Unknown shot type %d", shot);
|
|
|
8292759 |
|
|
|
8292759 |
}
|
|
|
8292759 |
- makesignal(from, message, on);
|
|
|
8292759 |
+ makesignal(from, "%s", on, message);
|
|
|
8292759 |
if (roll == 6 && rig) {
|
|
|
8292759 |
switch(Rhit) {
|
|
|
8292759 |
case 0:
|
|
|
8292759 |
@@ -190,7 +190,7 @@
|
|
|
8292759 |
default:
|
|
|
8292759 |
errx(1, "Bad Rhit = %d", Rhit);
|
|
|
8292759 |
}
|
|
|
8292759 |
- makemsg(on, message);
|
|
|
8292759 |
+ makemsg(on, "%s", message);
|
|
|
8292759 |
} else if (roll == 6) {
|
|
|
8292759 |
switch (Hhit) {
|
|
|
8292759 |
case 0:
|
|
|
8292759 |
@@ -218,7 +218,7 @@
|
|
|
8292759 |
default:
|
|
|
8292759 |
errx(1, "Bad Hhit = %d", Hhit);
|
|
|
8292759 |
}
|
|
|
8292759 |
- makemsg(on, message);
|
|
|
8292759 |
+ makemsg(on, "%s", message);
|
|
|
8292759 |
}
|
|
|
8292759 |
/*
|
|
|
8292759 |
if (Chit > 1 && on->file->readyL&R_INITIAL && on->file->readyR&R_INITIAL) {
|