- I wrote a long msg but the commit didn't go through.

- So here is the short version:
- a) Start moving to binary opens in Windows
- b) Give checkuid_mode() a small face lift including the fopen-wrappers.c
- The mode to this function should at least be a #define but that is for
- another day. Anyway this whole stuff should be given more face lifts in
- the future.

10 files changed, 24 insertions, 32 deletions

diff --git a/ext/db/db.c b/ext/db/db.c
index 9efe670a0c..aca8d7ea1f 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -289,7 +289,7 @@ dbm_info *php_dbm_open(char *filename, char *mode) {
 		return NULL;
 	}
 
-	if (PG(safe_mode) && (!php_checkuid(filename, 2))) {
+	if (PG(safe_mode) && (!php_checkuid(filename, NULL, 2))) {
 		return NULL;
 	}
 
diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 1131d4da9e..1149a644f0 100644
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -120,7 +120,7 @@ PHP_FUNCTION(dbase_open) {
 	convert_to_string(dbf_name);
 	convert_to_long(options);
 
-	if (PG(safe_mode) && (!php_checkuid(dbf_name->value.str.val, 2))) {
+	if (PG(safe_mode) && (!php_checkuid(dbf_name->value.str.val, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
@@ -583,7 +583,7 @@ PHP_FUNCTION(dbase_create) {
 		RETURN_FALSE;
 	}
 
-	if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_P(filename), 2))) {
+	if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_P(filename), NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c
index 9a7436b6da..4d0a943f0d 100644
--- a/ext/filepro/filepro.c
+++ b/ext/filepro/filepro.c
@@ -203,7 +203,7 @@ PHP_FUNCTION(filepro)
 	
 	sprintf(workbuf, "%s/map", dir->value.str.val);
 
-	if (PG(safe_mode) && (!php_checkuid(workbuf, 2))) {
+	if (PG(safe_mode) && (!php_checkuid(workbuf, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
@@ -302,7 +302,7 @@ PHP_FUNCTION(filepro_rowcount)
 	/* Now read the records in, moving forward recsize-1 bytes each time */
 	sprintf(workbuf, "%s/key", FP_GLOBAL(fp_database));
 
-	if (PG(safe_mode) && (!php_checkuid(workbuf, 2))) {
+	if (PG(safe_mode) && (!php_checkuid(workbuf, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
@@ -527,7 +527,7 @@ PHP_FUNCTION(filepro_retrieve)
 	/* Now read the record in */
 	sprintf(workbuf, "%s/key", FP_GLOBAL(fp_database));
 
-	if (PG(safe_mode) && (!php_checkuid(workbuf, 2))) {
+	if (PG(safe_mode) && (!php_checkuid(workbuf, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 9390349deb..81caec5eb1 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1539,7 +1539,7 @@ PHP_FUNCTION(pg_loimport)
 			break;
 	}
 	
-	if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(file_in), 2))) {
+	if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(file_in), NULL, 2))) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 9a3bbdedf2..34be8820f1 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -603,7 +603,7 @@ PHP_FUNCTION(posix_mkfifo)
 	convert_to_string(path);
 	convert_to_long(mode);
 
-	if (php3_ini.safe_mode && (!php_checkuid(path->value.str.val, 3))) {
+	if (php3_ini.safe_mode && (!php_checkuid(path->value.str.val, NULL, 3))) {
 		RETURN_FALSE;
 	}
 	result = mkfifo(path->value.str.val, mode->value.lval);
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 7fc6acc033..61bc6f21ce 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -86,11 +86,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 		tmp = php_escape_shell_cmd(d);
 		efree(d);
 		d = tmp;
-#ifdef PHP_WIN32
 		fp = V_POPEN(d, "rb");
-#else
-		fp = V_POPEN(d, "r");
-#endif
 		if (!fp) {
 			php_error(E_WARNING, "Unable to fork [%s]", d);
 			efree(d);
@@ -98,11 +94,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 			return -1;
 		}
 	} else { /* not safe_mode */
-#ifdef PHP_WIN32
 		fp = V_POPEN(cmd, "rb");
-#else
-		fp = V_POPEN(cmd, "r");
-#endif
 		if (!fp) {
 			php_error(E_WARNING, "Unable to fork [%s]", cmd);
 			efree(buf);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index c9911f10d6..c93426028d 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1344,7 +1344,7 @@ PHP_FUNCTION(mkdir)
 	convert_to_string_ex(arg1);
 	convert_to_long_ex(arg2);
 	mode = (*arg2)->value.lval;
-	if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val,3))) {
+	if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val, NULL, 3))) {
 		RETURN_FALSE;
 	}
 	ret = V_MKDIR((*arg1)->value.str.val,mode);
@@ -1369,7 +1369,7 @@ PHP_FUNCTION(rmdir)
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg1);
-	if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val,1))) {
+	if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val, NULL, 1))) {
 		RETURN_FALSE;
 	}
 	ret = rmdir((*arg1)->value.str.val);
@@ -1563,7 +1563,7 @@ PHP_FUNCTION(rename)
 	old_name = (*old_arg)->value.str.val;
 	new_name = (*new_arg)->value.str.val;
 
-	if (PG(safe_mode) &&(!php_checkuid(old_name, 2))) {
+	if (PG(safe_mode) &&(!php_checkuid(old_name, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	ret = rename(old_name, new_name);
@@ -1669,7 +1669,7 @@ PHP_FUNCTION(copy)
 	convert_to_string_ex(source);
 	convert_to_string_ex(target);
 
-	if (PG(safe_mode) &&(!php_checkuid((*source)->value.str.val,2))) {
+	if (PG(safe_mode) &&(!php_checkuid((*source)->value.str.val, NULL, 2))) {
 		RETURN_FALSE;
 	}
 	
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index ca7670af41..a82a05ed3f 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -252,7 +252,7 @@ PHP_FUNCTION(chgrp)
 		gid = (*group)->value.lval;
 	}
 
-	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val,1))) {
+	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val, NULL, 1))) {
 		RETURN_FALSE;
 	}
 
@@ -300,7 +300,7 @@ PHP_FUNCTION(chown)
 		uid = (*user)->value.lval;
 	}
 
-	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val,1))) {
+	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val, NULL, 1))) {
 		RETURN_FALSE;
 	}
 
@@ -333,7 +333,7 @@ PHP_FUNCTION(chmod)
 	convert_to_string_ex(filename);
 	convert_to_long_ex(mode);
 
-	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val,1))) {
+	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val, NULL, 1))) {
 		RETURN_FALSE;
 	}
 
@@ -396,7 +396,7 @@ PHP_FUNCTION(touch)
 	}
 	convert_to_string_ex(filename);
 
-	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val,1))) {
+	if (PG(safe_mode) &&(!php_checkuid((*filename)->value.str.val, NULL, 1))) {
 		if (newtime) efree(newtime);
 		RETURN_FALSE;
 	}
diff --git a/ext/standard/link.c b/ext/standard/link.c
index dbec5e087b..18cd67c1dc 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -110,7 +110,7 @@ PHP_FUNCTION(symlink)
 	convert_to_string_ex(topath);
 	convert_to_string_ex(frompath);
 
-	if (PG(safe_mode) && !php_checkuid((*topath)->value.str.val, 2)) {
+	if (PG(safe_mode) && !php_checkuid((*topath)->value.str.val, NULL, 2)) {
 		RETURN_FALSE;
 	}
 	if (!strncasecmp((*topath)->value.str.val,"http://",7) || !strncasecmp((*topath)->value.str.val,"ftp://",6)) {
@@ -141,7 +141,7 @@ PHP_FUNCTION(link)
 	convert_to_string_ex(topath);
 	convert_to_string_ex(frompath);
 
-	if (PG(safe_mode) && !php_checkuid((*topath)->value.str.val, 2)) {
+	if (PG(safe_mode) && !php_checkuid((*topath)->value.str.val, NULL, 2)) {
 		RETURN_FALSE;
 	}
 	if (!strncasecmp((*topath)->value.str.val,"http://",7) || !strncasecmp((*topath)->value.str.val,"ftp://",6)) {
@@ -171,7 +171,7 @@ PHP_FUNCTION(unlink)
 	}
 	convert_to_string_ex(filename);
 
-	if (PG(safe_mode) && !php_checkuid((*filename)->value.str.val, 2)) {
+	if (PG(safe_mode) && !php_checkuid((*filename)->value.str.val, NULL, 2)) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c3d8c29ce7..35758ce702 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -160,7 +160,7 @@ static gzFile php_gzopen_wrapper(char *path, char *mode, int options)
 		return php_gzopen_with_path(path, mode, PG(include_path), NULL);
 	}
 	else {
-		if (options & ENFORCE_SAFE_MODE && PG(safe_mode) && (!php_checkuid(path,1))) {
+		if (options & ENFORCE_SAFE_MODE && PG(safe_mode) && (!php_checkuid(path, NULL, 1))) {
 			return NULL;
 		}
 		if (php_check_open_basedir(path)) return NULL;
@@ -186,7 +186,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 	
 	/* Relative path open */
 	if (*filename == '.') {
-		if (PG(safe_mode) &&(!php_checkuid(filename,2))) {
+		if (PG(safe_mode) &&(!php_checkuid(filename, NULL, 2))) {
 			return(NULL);
 		}
 		if (php_check_open_basedir(filename)) return NULL;
@@ -209,7 +209,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 			} else {
 				strlcpy(trypath,filename,sizeof(trypath));
 			}
-			if (!php_checkuid(trypath,2)) {
+			if (!php_checkuid(trypath, NULL, 2)) {
 				return(NULL);
 			}
 			if (php_check_open_basedir(trypath)) return NULL;
@@ -225,7 +225,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 	}
 
 	if (!path || (path && !*path)) {
-		if (PG(safe_mode) &&(!php_checkuid(filename,2))) {
+		if (PG(safe_mode) &&(!php_checkuid(filename, NULL, 2))) {
 			return(NULL);
 		}
 		if (php_check_open_basedir(filename)) return NULL;
@@ -252,7 +252,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 		}
 		snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename);
 		if (PG(safe_mode)) {
-			if (V_STAT(trypath,&sb) == 0 &&(!php_checkuid(trypath,2))) {
+			if (V_STAT(trypath,&sb) == 0 &&(!php_checkuid(trypath, NULL, 2))) {
 				efree(pathbuf);
 				return(NULL);
 			}