This patch cleans up the handling of the variable `saved' in

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

diff --git a/mille/save.c b/mille/save.c
index a66a6597c4444af23b7217cfe7338fb92c13d593..3715f7b0ae84e4f863ee8c27c8b7f985d56a10fc 100644 (file)
--- a/mille/save.c
+++ b/mille/save.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: save.c,v 1.5 1997/05/23 23:09:43 jtc Exp $     */
+/*     $NetBSD: save.c,v 1.7 1999/03/29 05:12:39 mrg Exp $     */
 
 /*
  * Copyright (c) 1983, 1993
@@ -33,52 +33,43 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)save.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: save.c,v 1.5 1997/05/23 23:09:43 jtc Exp $";
+__RCSID("$NetBSD: save.c,v 1.7 1999/03/29 05:12:39 mrg Exp $");
 #endif
 #endif /* not lint */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <termios.h>
 #include "mille.h"
 
 #ifndef        unctrl
 #include "unctrl.h"
 #endif
 
-# ifdef        attron
-#      include <term.h>
-# endif        attron
-
 /*
  * @(#)save.c  1.2 (Berkeley) 3/28/83
  */
 
 typedef        struct stat     STAT;
 
-char   *ctime();
-
-int    read(), write();
-
 /*
  *     This routine saves the current game for use at a later date
+ *     Returns FALSE if it couldn't be done.
  */
-
-save() {
-
-       extern int      errno;
-       register char   *sp;
-       register int    outf;
-       register time_t *tp;
-       char            buf[80];
-       time_t          tme;
-       STAT            junk;
-
+bool
+save()
+{
+       char    *sp;
+       int     outf;
+       time_t  *tp;
+       char    buf[80];
+       time_t  tme;
+       STAT    junk;
+       bool    rv;
+
+       sp = NULL;
        tp = &tme;
        if (Fromfile && getyn(SAMEFILEPROMPT))
                strcpy(buf, Fromfile);
@@ -130,16 +121,20 @@ over:
        mvwaddstr(Score, ERR_Y, ERR_X, buf);
        wrefresh(Score);
        time(tp);                       /* get current time             */
-       strcpy(buf, ctime(tp));
-       for (sp = buf; *sp != '\n'; sp++)
-               continue;
-       *sp = '\0';
-       varpush(outf, write);
+       rv = varpush(outf, writev);
        close(outf);
-       wprintw(Score, " [%s]", buf);
+       if (rv == FALSE) {
+               unlink(buf);
+       } else {
+               strcpy(buf, ctime(tp));
+               for (sp = buf; *sp != '\n'; sp++)
+                       continue;
+               *sp = '\0';
+               wprintw(Score, " [%s]", buf);
+       }
        wclrtoeol(Score);
        wrefresh(Score);
-       return TRUE;
+       return rv;
 }
 
 /*
@@ -147,24 +142,25 @@ over:
  * backup was made on exiting, in which case certain things must
  * be cleaned up before the game starts.
  */
+bool
 rest_f(file)
-register char  *file;
+       char    *file;
 {
 
-       register char   *sp;
-       register int    inf;
-       char            buf[80];
-       STAT            sbuf;
+       char    *sp;
+       int     inf;
+       char    buf[80];
+       STAT    sbuf;
 
        if ((inf = open(file, 0)) < 0) {
-               perror(file);
+               warn("%s", file);
                exit(1);
        }
        if (fstat(inf, &sbuf) < 0) {            /* get file stats       */
-               perror(file);
+               warn("%s", file);
                exit(1);
        }
-       varpush(inf, read);
+       varpush(inf, readv);
        close(inf);
        strcpy(buf, ctime(&sbuf.st_mtime));
        for (sp = buf; *sp != '\n'; sp++)
@@ -177,4 +173,3 @@ register char       *file;
        Fromfile = file;
        return !On_exit;
 }
-