cgram: adjust style to survive lint's strict bool mode

[bsdgames-darwin.git] / mille / varpush.c

diff --git a/mille/varpush.c b/mille/varpush.c
index 8b71d9a74d4af53230087c8b4d2b157db0e7e205..319637459089e78eef4a6cc891ae31ee3237a797 100644 (file)
--- a/mille/varpush.c
+++ b/mille/varpush.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: varpush.c,v 1.10 2009/05/25 23:34:50 dholland Exp $    */
+/*     $NetBSD: varpush.c,v 1.13 2016/06/05 18:39:02 christos Exp $    */
 
 /*
  * Copyright (c) 1982, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)varpush.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: varpush.c,v 1.10 2009/05/25 23:34:50 dholland Exp $");
+__RCSID("$NetBSD: varpush.c,v 1.13 2016/06/05 18:39:02 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,33 +70,35 @@ varpush(int file, ssize_t (*func)(int, const struct iovec *, int))
        };
 
        if (((func)(file, vec, sizeof(vec) / sizeof(vec[0]))) < 0) {
-               error(strerror(errno));
+               error("%s", strerror(errno));
                return FALSE;
        }
        if (func == readv) {
                if ((read(file, (void *) &temp, sizeof temp)) < 0) {
-                       error(strerror(errno));
+                       error("%s", strerror(errno));
                        return FALSE;
                }
                Topcard = &Deck[temp];
 #ifdef DEBUG
                if (Debug) {
-                       char    buf[80];
+                       char    buf[80], *bp;
 over:
                        printf("Debug file:");
-                       gets(buf);
+                       fgets(buf, (int)sizeof(buf), stdin);
+                       if ((bp = strchr(buf, '\n')) != NULL)
+                               *bp = '\0';
                        if ((outf = fopen(buf, "w")) == NULL) {
                                warn("%s", buf);
                                goto over;
                        }
                        if (strcmp(buf, _PATH_DEVNULL) != 0)
-                               setbuf(outf, (char *)NULL);
+                               setbuf(outf, NULL);
                }
 #endif
        } else {
                temp = Topcard - Deck;
                if ((write(file, (void *) &temp, sizeof temp)) < 0) {
-                       error(strerror(errno));
+                       error("%s", strerror(errno));
                        return FALSE;
                }
        }