mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-07 19:44:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

(PHP exec) Return last line of output properly.

Browse Source
This commit is contained in:
Andrei Zmievski 2000-02-22 18:00:32 +00:00
parent 9133a9b8b0
commit 98674b73bd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/standard/exec.c
View File

@ -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