From: Stanislav Malyshev <stas@php.net>
Date: Mon, 26 Jun 2000 17:12:38 +0000 (+0000)
Subject: Make exec() fwork on Unix again
X-Git-Tag: php-4.0.1RC2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fd20c3ec7e7d5213f9c810c68db4ecccaa24c6c;p=php

Make exec() fwork on Unix again
---

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 61bc6f21ce..7fc6acc033 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -86,7 +86,11 @@ 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);
@@ -94,7 +98,11 @@ 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);