Remove File_Open

Other than its blocking of access to certain files, it really wasn't
that useful compared to the functions in qfs, and pointless with access
to qfs anyway.

include/rua_internal.h

@@ -39,8 +39,6 @@ void RUA_Cmd_Init (struct progs_s *pr, int secure);
 
 void RUA_Cvar_Init (struct progs_s *pr, int secure);
 
-void RUA_File_Init (struct progs_s *pr, int secure);
-
 void RUA_Hash_Init (struct progs_s *pr, int secure);
 
 void RUA_Math_Init (struct progs_s *pr, int secure);

libs/ruamoko/Makefile.am

@@ -16,6 +16,6 @@ libQFruamoko_la_LIBADD=			$(rua_libs)
 libQFruamoko_la_DEPENDENCIES=	$(rua_libs)
 libQFruamoko_la_SOURCES= \
 		pr_cmds.c \
-		rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
+		rua_cbuf.c rua_cmd.c rua_cvar.c rua_hash.c rua_init.c \
 		rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
 		rua_script.c rua_set.c rua_string.c

libs/ruamoko/rua_file.c

@@ -1,184 +0,0 @@
-/*
-	bi_file.c
-
-	CSQC file builtins
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-	See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to:
-
-		Free Software Foundation, Inc.
-		59 Temple Place - Suite 330
-		Boston, MA  02111-1307, USA
-
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#ifdef HAVE_FNMATCH_H
-# define model_t sunmodel_t
-# include <fnmatch.h>
-# undef model_t
-#else
-# ifdef _WIN32
-# include "fnmatch.h"
-# endif
-#endif
-
-#ifndef HAVE_FNMATCH_PROTO
-int         fnmatch (const char *__pattern, const char *__string, int __flags);
-#endif
-
-#include "QF/cvar.h"
-#include "QF/progs.h"
-#include "QF/quakefs.h"
-#include "QF/va.h"
-#include "QF/zone.h"
-
-#include "rua_internal.h"
-
-static const char *file_ban_list[] = {
-	"default.cfg{,.gz}",
-	"demo1.dem{,.gz}",
-	"demo2.dem{,.gz}",
-	"demo3.dem{,.gz}",
-	"end1.bin{,.gz}",
-	"end2.bin{,.gz}",
-	"gfx.wad{,.gz}",
-	"progs.dat{,.gz}",
-	"quake.rc{,.gz}",
-	0,
-};
-
-static const char *dir_ban_list[] = {
-	"gfx",
-	"maps",
-	"progs",
-	"skins",
-	"sound",
-	0,
-};
-
-static int
-file_readable (char *path)
-{
-	char        t;
-	char       *p = strchr (path, '/');
-	const char **match;
-
-	if (p) {
-		t = *p;
-		*p = 0;
-		for (match = dir_ban_list; *match; match++) {
-			if (fnmatch (*match, path, FNM_PATHNAME) == 0) {
-				*p = t;
-				return 0;
-			}
-		}
-	} else {
-		for (match = file_ban_list; *match; match++) {
-			if (fnmatch (*match, path, FNM_PATHNAME) == 0) {
-				return 0;
-			}
-		}
-	}
-	return 1;
-}
-
-static int
-file_writeable (char *path)
-{
-	return file_readable (path);
-}
-
-static void
-bi_File_Open (progs_t *pr)
-{
-	QFile      *file;
-	const char *pth = P_GSTRING (pr, 0);
-	const char *mode = P_GSTRING (pr, 1);
-	char       *path;
-	char       *p;
-	int         do_write = 0;
-	int         do_read = 0;
-
-	p = strchr (mode, 'r');
-	if (p) {
-		do_read |= 1;
-		if (p[1] == '+')
-			do_write |= 1;
-	}
-
-	p = strchr (mode, 'w');
-	if (p) {
-		do_write |= 1;
-		if (p[1] == '+')
-			do_read |= 1;
-	}
-
-	p = strchr (mode, 'a');
-	if (p) {
-		do_write |= 1;
-		if (p[1] == '+')
-			do_read |= 1;
-	}
-
-	path = QFS_CompressPath (pth);
-	//printf ("'%s'  '%s'\n", P_GSTRING (pr, 0), path);
-	if (!path[0])
-		goto error;
-	if (path[0] == '.' && path[1] == '.' && (path[2] == '/' || path [2] == 0))
-		goto error;
-	if (path[strlen (path) - 1] =='/')
-		goto error;
-	if (!do_read && !do_write)
-		goto error;
-	if (do_read && !file_readable (path))
-		goto error;
-	if (do_write && !file_writeable (path))
-		goto error;
-
-	file = QFS_Open (va ("%s/%s", qfs_gamedir->dir.def, path), mode);
-	if (!file)
-		goto error;
-	free (path);
-	if ((R_INT (pr) = QFile_AllocHandle (pr, file)))
-		return;
-	Qclose (file);
-	return;
-error:
-	free (path);
-	R_INT (pr) = 0;
-}
-
-static builtin_t builtins[] = {
-	{"File_Open",	bi_File_Open,	-1},
-	{0}
-};
-
-void
-RUA_File_Init (progs_t *pr, int secure)
-{
-	PR_RegisterBuiltins (pr, builtins);
-}

libs/ruamoko/rua_init.c

@@ -39,7 +39,6 @@ static void (*init_funcs[])(progs_t *, int) = {
 	RUA_Cbuf_Init,
 	RUA_Cmd_Init,
 	RUA_Cvar_Init,
-	RUA_File_Init,
 	RUA_Hash_Init,
 	RUA_Math_Init,
 	RUA_MsgBuf_Init,

libs/ruamoko/rua_qfs.c

@@ -181,6 +181,12 @@ bi_QFS_FilelistFree (progs_t *pr)
 	PR_Zone_Free (pr, list);
 }
 
+static void
+bi_QFS_GetDirectory (progs_t *pr)
+{
+	RETURN_STRING (pr, qfs_gamedir->dir.def);
+}
+
 static builtin_t builtins[] = {
 	{"QFS_Open",			bi_QFS_Open,			-1},
 	{"QFS_WOpen",			bi_QFS_WOpen,			-1},
@@ -190,6 +196,7 @@ static builtin_t builtins[] = {
 	{"QFS_WriteFile",		bi_QFS_WriteFile,		-1},
 	{"QFS_Filelist",		bi_QFS_Filelist,		-1},
 	{"QFS_FilelistFree",	bi_QFS_FilelistFree,	-1},
+	{"QFS_GetDirectory",	bi_QFS_GetDirectory,	-1},
 	{0}
 };
 

ruamoko/cl_menu/client_menu.r

@@ -1,6 +1,5 @@
 #include "AutoreleasePool.h"
 #include "menu.h"
-#include "file.h"
 #include "cmd.h"
 #include "gib.h"
 #include "draw.h"
@@ -10,6 +9,7 @@
 #include "options.h"
 #include "servlist.h"
 #include "system.h"
+#include "qfs.h"
 #include "debug.h"
 #include "HUD.h"
 #include "client_menu.h"
@@ -137,17 +137,17 @@ void (int quick) scan_saves =
 	local QFile		f;
 	local string    line;
 	local int max = MAX_SAVEGAMES;
-	if (quick)
+	string basename = "s";
+	if (quick) {
 		max = MAX_QUICK;
+		basename = "quick";
+	}
+	string gamedir = QFS_GetDirectory();
 	for (i = 0; i < max; i++) {
 		if (!filenames[i])
 			filenames[i] = str_new ();
 		loadable[i] = 0;
-		if (quick) {
-			f = File_Open (sprintf ("quick%i.sav", i + 1), "rz");
-		} else {
-			f = File_Open (sprintf ("s%i.sav", i), "rz");
-		}
+		f = QFS_OpenFile (sprintf ("%s/%s%i.sav", gamedir, basename, i));
 		if (!f) {
 			str_copy (filenames[i], "--- UNUSED SLOT ---");
 			continue;

ruamoko/include/Makefile.am

@@ -7,7 +7,7 @@ nobase_pkginclude_HEADERS= \
 	\
 	draw.h key.h \
 	\
-	cbuf.h cmd.h cvar.h file.h gib.h hash.h plist.h runtime.h \
+	cbuf.h cmd.h cvar.h gib.h hash.h plist.h runtime.h \
 	Object.h Protocol.h \
 	AutoreleasePool.h Array.h Entity.h PropertyList.h Set.h \
 	\

ruamoko/include/file.h

@@ -1,8 +0,0 @@
-#ifndef __ruamoko_file_h
-#define __ruamoko_file_h
-
-#include "qfile.h"
-
-@extern QFile File_Open (string path, string mode);
-
-#endif//__ruamoko_file_h

ruamoko/include/qfs.h

@@ -17,5 +17,6 @@ typedef struct _qfslist_t *QFSlist;
 @extern int QFS_WriteFile (string filename, void *buf, int count);
 @extern QFSlist QFS_Filelist (string path, string ext, int strip);
 @extern void  QFS_FilelistFree (QFSlist list);
+@extern string QFS_GetDirectory (void);
 
 #endif//__ruamoko_qfs_h

ruamoko/lib/Makefile.am

@@ -26,7 +26,7 @@ SUFFIXES= .o .r .qc
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 libr_a_SOURCES=\
-	cbuf.r cmd.r cvar.r file.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
+	cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \
 	sound.r string.r math.r types.r \
 	Object.r Protocol.r \
 	AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r

ruamoko/lib/file.r

@@ -1,3 +0,0 @@
-#include "file.h"
-
-QFile (string path, string mode) File_Open = #0;

ruamoko/lib/qfs.r

@@ -8,3 +8,4 @@ QFile QFS_OpenFile (string filename) = #0;
 int QFS_WriteFile (string filename, void *buf, int count) = #0;
 QFSlist QFS_Filelist (string path, string ext, int strip) = #0;
 void  QFS_FilelistFree (QFSlist list) = #0;
+string QFS_GetDirectory (void) = #0;