From 33f08b6a430dd0cd7eebb05f797d5a60fa78337c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 20 Dec 2006 12:08:57 +0000
Subject: [PATCH] add QFS_Open and QFS_WOpen

---
 libs/ruamoko/rua_qfs.c | 32 ++++++++++++++++++++++++++++++++
 ruamoko/include/qfs.h  |  2 ++
 ruamoko/lib/qfs.r      |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/libs/ruamoko/rua_qfs.c b/libs/ruamoko/rua_qfs.c
index 1d367f7e1..d30998739 100644
--- a/libs/ruamoko/rua_qfs.c
+++ b/libs/ruamoko/rua_qfs.c
@@ -62,6 +62,36 @@ check_buffer (progs_t *pr, pr_type_t *buf, int count, const char *name)
 }
 
 
+static void
+bi_QFS_Open (progs_t *pr)
+{
+	QFile      *file;
+	const char *path = P_GSTRING (pr, 0);
+	const char *mode = P_GSTRING (pr, 1);
+
+	if (!(file = QFS_Open (path, mode))) {
+		R_INT (pr) = 0;
+		return;
+	}
+	if (!(R_INT (pr) = QFile_AllocHandle (pr, file)))
+		Qclose (file);
+}
+
+static void
+bi_QFS_WOpen (progs_t *pr)
+{
+	QFile      *file;
+	const char *path = P_GSTRING (pr, 0);
+	int         zip = P_INT (pr, 1);
+
+	if (!(file = QFS_WOpen (path, zip))) {
+		R_INT (pr) = 0;
+		return;
+	}
+	if (!(R_INT (pr) = QFile_AllocHandle (pr, file)))
+		Qclose (file);
+}
+
 static void
 bi_QFS_Rename (progs_t *pr)
 {
@@ -149,6 +179,8 @@ bi_QFS_FilelistFree (progs_t *pr)
 }
 
 static builtin_t builtins[] = {
+	{"QFS_Open",			bi_QFS_Open,			-1},
+	{"QFS_WOpen",			bi_QFS_WOpen,			-1},
 	{"QFS_Rename",			bi_QFS_Rename,			-1},
 	{"QFS_LoadFile",		bi_QFS_LoadFile,		-1},
 	{"QFS_OpenFile",		bi_QFS_OpenFile,		-1},
diff --git a/ruamoko/include/qfs.h b/ruamoko/include/qfs.h
index 5cfa406fa..3e2bc5532 100644
--- a/ruamoko/include/qfs.h
+++ b/ruamoko/include/qfs.h
@@ -6,6 +6,8 @@
 struct _qfslist_t = {};
 typedef struct _qfslist_t [] QFSlist;
 
+@extern QFile (string path, string mode) QFS_Open;
+@extern QFile (string path, integer zip) QFS_WOpen;
 @extern integer (string old, string new) QFS_Rename;
 @extern (void []) (string filename) QFS_LoadFile;
 @extern QFile (string filename) QFS_OpenFile;
diff --git a/ruamoko/lib/qfs.r b/ruamoko/lib/qfs.r
index 3a22166fd..92452f850 100644
--- a/ruamoko/lib/qfs.r
+++ b/ruamoko/lib/qfs.r
@@ -1,5 +1,7 @@
 #include "qfs.h"
 
+QFile (string path, string mode) QFS_Open = #0;
+QFile (string path, integer zip) QFS_WOpen = #0;
 integer (string old, string new) QFS_Rename = #0;
 (void []) (string filename) QFS_LoadFile = #0;
 QFile (string filename) QFS_OpenFile = #0;