A few better buffer sizes (from Ian McWilliam, long ago); functions local

to save.c are no longer in rogue.h; use write() to save files rather than
fwrite() since this can end up being called in a signal handler (it's still
not clean though).

2 files changed, 55 insertions, 45 deletions

diff --git a/games/rogue/rogue.h b/games/rogue/rogue.h
index 4a72c9e2230..c0d11db33e9 100644
--- a/games/rogue/rogue.h
+++ b/games/rogue/rogue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rogue.h,v 1.8 2002/07/18 07:13:57 pjanzen Exp $	*/
+/*	$OpenBSD: rogue.h,v 1.9 2002/07/26 19:56:07 pjanzen Exp $	*/
 /*	$NetBSD: rogue.h,v 1.4 1995/04/24 12:25:04 cgd Exp $	*/
 
 /*
@@ -553,7 +553,6 @@ void	gr_wand(object *);
 void	gr_weapon(object *, int);
 void	hallucinate(void);
 boolean	has_amulet(void);
-boolean	has_been_touched(struct rogue_time *, struct rogue_time *);
 void	heal(void);
 void	hide_boxed_passage(short, short, short, short, short);
 void	hold_monster(void);
@@ -654,14 +653,10 @@ void	put_stairs(void);
 void	quaff(void);
 void	quit(boolean);
 int	r_index(char *, int, boolean);
-void	r_read(FILE *, char *, size_t);
-void	r_write(FILE *, char *, size_t);
 void	rand_around(short, short *, short *);
 int	rand_percent(int);
 void	rand_place(object *);
-void	read_pack(object *, FILE *, boolean);
 void	read_scroll(void);
-void	read_string(char *, size_t, FILE *);
 void	recursive_deadend(short, short *, short, short);
 boolean	reg_move(void);
 void	relight(void);
@@ -677,9 +672,6 @@ void	rogue_hit(object *, boolean);
 int	rogue_is_around(short, short);
 long	rrandom(void);
 void	rust(object *);
-void	rw_dungeon(FILE *, boolean);
-void	rw_id(struct id *, FILE *, int, boolean);
-void	rw_rooms(FILE *, boolean);
 void	s_con_mon(object *);
 int	same_col(int, int);
 int	same_row(int, int);
@@ -734,8 +726,6 @@ void	wear(void);
 void	wield(void);
 void	win(void);
 void	wizardize(void);
-void	write_pack(object *, FILE *);
-void	write_string(char *, FILE *);
 long	xxx(boolean);
 void	xxxx(char *, short);
 void	zap_monster(object *, unsigned short);
diff --git a/games/rogue/save.c b/games/rogue/save.c
index 0397f80b47b..9013fd4f76e 100644
--- a/games/rogue/save.c
+++ b/games/rogue/save.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: save.c,v 1.6 2002/07/18 07:13:57 pjanzen Exp $	*/
+/*	$OpenBSD: save.c,v 1.7 2002/07/26 19:56:07 pjanzen Exp $	*/
 /*	$NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
 #else
-static const char rcsid[] = "$OpenBSD: save.c,v 1.6 2002/07/18 07:13:57 pjanzen Exp $";
+static const char rcsid[] = "$OpenBSD: save.c,v 1.7 2002/07/26 19:56:07 pjanzen Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,16 +57,33 @@ static const char rcsid[] = "$OpenBSD: save.c,v 1.6 2002/07/18 07:13:57 pjanzen
  *
  */
 
+#include <sys/param.h>
+#include <sys/types.h>
+#include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
 #include "rogue.h"
 
-short write_failed = 0;
-char *save_file = (char *) 0;
+char *save_file = (char *) NULL;
+
+static short write_failed = 0;
+
+static void write_pack(object *, int);
+static void read_pack(object *, int, boolean);
+static void rw_dungeon(int, boolean);
+static void rw_id(struct id *, int, int, boolean);
+static void write_string(char *, int);
+static void read_string(char *, size_t, int);
+static void rw_rooms(int, boolean);
+static void r_read(int, char *, size_t);
+static void r_write(int, char *, size_t);
+static boolean has_been_touched(struct rogue_time *, struct rogue_time *);
+
 
 void
 save_game()
 {
-	char fname[256];
+	char fname[MAXPATHLEN];
 
 	if (!get_input_line("file name?", save_file, fname, sizeof(fname),
 	    "game not saved", 0, 1)) {
@@ -81,9 +98,9 @@ void
 save_into_file(sfile)
 	char *sfile;
 {
-	FILE *fp;
+	int fp;
 	int file_id;
-	char name_buffer[80];
+	char name_buffer[MAXPATHLEN];
 	char *hptr;
 	struct rogue_time rt_buf;
 
@@ -99,9 +116,11 @@ save_into_file(sfile)
 			}
 		}
 	}
-	if (	((fp = fopen(sfile, "w")) == NULL) ||
+	if (	((fp = open(sfile, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1) ||
 			((file_id = md_get_file_id(sfile)) == -1)) {
 		messagef(0, "problem accessing the save file");
+		if (fp != -1)
+			close(fp);
 		return;
 	}
 	md_ignore_signals();
@@ -143,7 +162,7 @@ save_into_file(sfile)
 	md_gct(&rt_buf);
 	rt_buf.second += 10;		/* allow for some processing time */
 	r_write(fp, (char *) &rt_buf, sizeof(rt_buf));
-	fclose(fp);
+	close(fp);
 
 	if (write_failed) {
 		(void) md_df(sfile);	/* delete file */
@@ -156,15 +175,16 @@ void
 restore(fname)
 	char *fname;
 {
-	FILE *fp;
+	int fp;
 	struct rogue_time saved_time, mod_time;
 	char buf[4];
 	char tbuf[LOGIN_NAME_LEN];
 	int new_file_id, saved_file_id;
 
 	if (((new_file_id = md_get_file_id(fname)) == -1) ||
-			((fp = fopen(fname, "r")) == NULL)) {
+			((fp = open(fname, O_RDONLY, 0)) == NULL)) {
 		clean_up("cannot open file");
+		return;	/* NOT REACHED */
 	}
 	if (md_link_count(fname) > 1) {
 		clean_up("file has link");
@@ -214,7 +234,7 @@ restore(fname)
 	r_read(fp, (char *) &m_moves, sizeof(m_moves));
 	r_read(fp, (char *) &saved_time, sizeof(saved_time));
 
-	if (fread(buf, sizeof(char), 1, fp) > 0) {
+	if (read(fp, buf, 1) > 0) {
 		clear();
 		clean_up("extra characters in file");
 	}
@@ -230,13 +250,13 @@ restore(fname)
 	}
 	msg_cleared = 0;
 	ring_stats(0);
-	fclose(fp);
+	close(fp);
 }
 
-void
+static void
 write_pack(pack, fp)
 	object *pack;
-	FILE *fp;
+	int fp;
 {
 	object t;
 
@@ -247,10 +267,10 @@ write_pack(pack, fp)
 	r_write(fp, (char *) &t, sizeof(object));
 }
 
-void
+static void
 read_pack(pack, fp, is_rogue)
 	object *pack;
-	FILE *fp;
+	int fp;
 	boolean is_rogue;
 {
 	object read_obj, *new_obj;
@@ -278,9 +298,9 @@ read_pack(pack, fp, is_rogue)
 	}
 }
 
-void
+static void
 rw_dungeon(fp, rw)
-	FILE *fp;
+	int fp;
 	boolean rw;
 {
 	short i, j;
@@ -303,10 +323,10 @@ rw_dungeon(fp, rw)
 	}
 }
 
-void
+static void
 rw_id(id_table, fp, n, wr)
 	struct id id_table[];
-	FILE *fp;
+	int fp;
 	int n;
 	boolean wr;
 {
@@ -328,10 +348,10 @@ rw_id(id_table, fp, n, wr)
 	}
 }
 
-void
+static void
 write_string(s, fp)
 	char *s;
-	FILE *fp;
+	int fp;
 {
 	short n;
 
@@ -341,11 +361,11 @@ write_string(s, fp)
 	r_write(fp, s, n);
 }
 
-void
+static void
 read_string(s, maxlen, fp)
 	char *s;
 	size_t maxlen;
-	FILE *fp;
+	int fp;
 {
 	short n;
 
@@ -358,9 +378,9 @@ read_string(s, maxlen, fp)
 	s[n - 1] = '\0';
 }
 
-void
+static void
 rw_rooms(fp, rw)
-	FILE *fp;
+	int fp;
 	boolean rw;
 {
 	short i;
@@ -371,25 +391,25 @@ rw_rooms(fp, rw)
 	}
 }
 
-void
+static void
 r_read(fp, buf, n)
-	FILE *fp;
+	int fp;
 	char *buf;
 	size_t n;
 {
-	if (fread(buf, sizeof(char), n, fp) != n) {
+	if (read(fp, buf, n) != n) {
 		clean_up("read() failed, don't know why");
 	}
 }
 
-void
+static void
 r_write(fp, buf, n)
-	FILE *fp;
+	int fp;
 	char *buf;
 	size_t n;
 {
 	if (!write_failed) {
-		if (fwrite(buf, sizeof(char), n, fp) != n) {
+		if (write(fp, buf, n) != n) {
 			messagef(0, "write() failed, don't know why");
 			beep();
 			write_failed = 1;
@@ -397,7 +417,7 @@ r_write(fp, buf, n)
 	}
 }
 
-boolean
+static boolean
 has_been_touched(saved_time, mod_time)
 	struct rogue_time *saved_time, *mod_time;
 {