Added the same open()/fopen()/creat()/mmap() -> sys_XXX calls.

Tidied up some of the mess (no other word for it). Still doesn't
compile cleanly. There are calls with incorrect parameters that
don't seem to be doing the right thing.

This code still needs surgery :-(.

Jeremy.

3 files changed, 7 insertions, 7 deletions

diff --git a/source/web/cgi.c b/source/web/cgi.c
index db2cfb4555a..009244e5957 100644
--- a/source/web/cgi.c
+++ b/source/web/cgi.c
@@ -437,7 +437,7 @@ static void cgi_download(char *file)
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
-	fd = open(file,O_RDONLY);
+	fd = sys_open(file,O_RDONLY,0);
 	if (fd == -1) {
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
@@ -493,7 +493,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	inetd_server = True;
 
 #if CGI_LOGGING
-	f = fopen("/tmp/cgi.log", "a");
+	f = sys_fopen("/tmp/cgi.log", "a");
 	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
 		       http_timestring(time(NULL)),
 		       client_name(1), client_addr(1));
diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index 184f7e1f73c..81564390a0c 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -124,7 +124,7 @@ void status_page(void)
 	pstrcat(fname,"/STATUS..LCK");
 
 
-	f = fopen(fname,"r");
+	f = sys_fopen(fname,"r");
 	if (f) {
 		while (!feof(f)) {
 			if (fread(&crec,sizeof(crec),1,f) != 1)	break;
@@ -157,7 +157,7 @@ void status_page(void)
 
 	printf("<p>\n");
 
-	f = fopen(fname,"r");
+	f = sys_fopen(fname,"r");
 	if (!f) {
 		printf("Couldn't open status file %s\n",fname);
 		if (!lp_status(-1))
diff --git a/source/web/swat.c b/source/web/swat.c
index cdbd1f8c8c4..7004891f32f 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -106,7 +106,7 @@ static char *make_parm_name(char *label)
 ****************************************************************************/
 static int include_html(char *fname)
 {
-	FILE *f = fopen(fname,"r");
+	FILE *f = sys_fopen(fname,"r");
 	char buf[1024];
 	int ret;
 
@@ -318,7 +318,7 @@ static int save_reload(void)
 {
 	FILE *f;
 
-	f = fopen(servicesf,"w");
+	f = sys_fopen(servicesf,"w");
 	if (!f) {
 		printf("failed to open %s for writing\n", servicesf);
 		return 0;
@@ -894,7 +894,7 @@ static void printers_page(void)
 	/* just in case it goes wild ... */
 	alarm(300);
 
-	dbf = fopen("/dev/null", "w");
+	dbf = sys_fopen("/dev/null", "w");
 
 	if (!dbf) dbf = stderr;