From: Andrei Zmievski <andrei@php.net>
Date: Tue, 22 Feb 2000 18:00:32 +0000 (+0000)
Subject: (PHP exec) Return last line of output properly.
X-Git-Tag: PHP-4.0-RC1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98674b73bdbaf9c26a20a722100539aefb97abe7;p=php

(PHP exec) Return last line of output properly.
---

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index e9a81d09a8..f91750d31a 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -166,6 +166,14 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 		while (l && isspace((int)buf[--l]));
 		if (l < t) buf[l + 1] = '\0';
 
+		/* Return last line from the shell command */
+		if (PG(magic_quotes_runtime)) {
+			int len;
+
+			tmp = php_addslashes(buf, 0, &len, 0);
+			RETVAL_STRINGL(tmp,len,0);
+		} else
+			RETVAL_STRINGL(buf,l,1);
 	} else {
 		int b, i;
 
@@ -174,14 +182,6 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 				if (output) (void)PUTC(buf[i]);
 		}
 	}
-
-	/* Return last line from the shell command */
-	if (PG(magic_quotes_runtime) && type!=3) {
-		int len;
-		
-		tmp = php_addslashes(buf, 0, &len, 0);
-		RETVAL_STRINGL(tmp,len,0);
-	}
 	
 	ret = pclose(fp);
 #if HAVE_SYS_WAIT_H