 @@ -1,14 +1,14 @@
-/*	$NetBSD: save.c,v 1.15 2010/04/04 00:08:49 christos Exp $	*/
+/*	$NetBSD: save.c,v 1.16 2011/08/26 09:01:07 tron Exp $	*/
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: save.c,v 1.15 2010/04/04 00:08:49 christos Exp $");
+__RCSID("$NetBSD: save.c,v 1.16 2011/08/26 09:01:07 tron Exp $");
 #endif
 #endif /* not lint */
 #include <time.h>
 #include "mille.h"
 #ifndef	unctrl
 #include "unctrl.h"
 #endif
 /*
  * @(#)save.c	1.2 (Berkeley) 3/28/83
 @@ -103,27 +103,27 @@ over:
 		*sp = '\0';
 		leaveok(Board, TRUE);
+	}
 	/*
 	 * check for existing files, and confirm overwrite if needed
 	 */
 	if (sp == buf || (!Fromfile && stat(buf, &junk) > -1
 	    && getyn(OVERWRITEFILEPROMPT) == FALSE))
 		return FALSE;
 	if ((outfd = creat(buf, 0644)) < 0) {
-		error(strerror(errno));
+		error("%s", strerror(errno));
 		return FALSE;
+	}
 	mvwaddstr(Score, ERR_Y, ERR_X, buf);
 	wrefresh(Score);
 	time(tp);			/* get current time		*/
 	rv = varpush(outfd, writev);
 	close(outfd);
 	if (rv == FALSE) {
 		unlink(buf);
 	} else {
 		char *p;
 		if ((p = ctime(tp)) == NULL)
 			strcpy(buf, "?");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: varpush.c,v 1.10 2009/05/25 23:34:50 dholland Exp $	*/
+/*	$NetBSD: varpush.c,v 1.11 2011/08/26 09:01:07 tron Exp $	*/
 /*
  * Copyright (c) 1982, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #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.11 2011/08/26 09:01:07 tron Exp $");
 #endif
 #endif /* not lint */
 #include <paths.h>
 #include "mille.h"
 /*
  * @(#)varpush.c	1.1 (Berkeley) 4/1/82
  */
 /*
  *	push variables around via the routine func() on the file
  * channel file.  func() is either read or write.
 @@ -60,45 +60,45 @@ varpush(int file, ssize_t (*func)(int, c
 		{ (void *) &End, sizeof End },
 		{ (void *) &On_exit, sizeof On_exit },
 		{ (void *) &Handstart, sizeof Handstart },
 		{ (void *) &Numgos, sizeof Numgos },
 		{ (void *) Numseen, sizeof Numseen },
 		{ (void *) &Play, sizeof Play },
 		{ (void *) &Window, sizeof Window },
 		{ (void *) Deck, sizeof Deck },
 		{ (void *) &Discard, sizeof Discard },
 		{ (void *) Player, sizeof Player }
 	};
 	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];
 over:
 			printf("Debug file:");
 			gets(buf);
 			if ((outf = fopen(buf, "w")) == NULL) {
 				warn("%s", buf);
 				goto over;
+			}
 			if (strcmp(buf, _PATH_DEVNULL) != 0)
 				setbuf(outf, (char *)NULL);
+		}
 #endif
 	} else {
 		temp = Topcard - Deck;
 		if ((write(file, (void *) &temp, sizeof temp)) < 0) {
-			error(strerror(errno));
+			error("%s", strerror(errno));
 			return FALSE;
+		}
+	}
 	return TRUE;
+}