iliaa Mon Feb 17 20:23:52 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c exec.c exec.h
Log:
By popular demand nice() is renamed to proc_nice().
A better error message for proc_nice() failure.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.581
php4/ext/standard/basic_functions.c:1.582
--- php4/ext/standard/basic_functions.c:1.581 Mon Feb 17 20:07:55 2003
+++ php4/ext/standard/basic_functions.c Mon Feb 17 20:23:51 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.581 2003/02/18 01:07:55 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.582 2003/02/18 01:23:51 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -425,7 +425,7 @@
#endif
#ifdef HAVE_NICE
- PHP_FE(nice,
NULL)
+ PHP_FE(proc_nice,
+ NULL)
#endif
PHP_FE(rand,
NULL)
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.93 php4/ext/standard/exec.c:1.94
--- php4/ext/standard/exec.c:1.93 Mon Feb 17 20:07:57 2003
+++ php4/ext/standard/exec.c Mon Feb 17 20:23:51 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.93 2003/02/18 01:07:57 iliaa Exp $ */
+/* $Id: exec.c,v 1.94 2003/02/18 01:23:51 iliaa Exp $ */
#include <stdio.h>
#include "php.h"
@@ -492,9 +492,9 @@
/* }}} */
#ifdef HAVE_NICE
-/* {{{ proto bool nice(int priority)
+/* {{{ proto bool proc_nice(int priority)
Change the priority of the current process */
-PHP_FUNCTION(nice)
+PHP_FUNCTION(proc_nice)
{
long pri;
@@ -505,7 +505,7 @@
errno = 0;
nice(pri);
if (errno) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may
attempt to increase the process priority.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may
+attempt to increase the priority of a process.");
RETURN_FALSE;
}
Index: php4/ext/standard/exec.h
diff -u php4/ext/standard/exec.h:1.19 php4/ext/standard/exec.h:1.20
--- php4/ext/standard/exec.h:1.19 Mon Feb 17 20:07:57 2003
+++ php4/ext/standard/exec.h Mon Feb 17 20:23:51 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exec.h,v 1.19 2003/02/18 01:07:57 iliaa Exp $ */
+/* $Id: exec.h,v 1.20 2003/02/18 01:23:51 iliaa Exp $ */
#ifndef EXEC_H
#define EXEC_H
@@ -31,7 +31,7 @@
PHP_FUNCTION(proc_get_status);
PHP_FUNCTION(proc_close);
PHP_FUNCTION(proc_terminate);
-PHP_FUNCTION(nice);
+PHP_FUNCTION(proc_nice);
PHP_MINIT_FUNCTION(proc_open);
char *php_escape_shell_cmd(char *);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php