clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Made CLI option -d output error and exit if an non-existing (or unmodifyable) entry is passed

Browse Source
This commit is contained in:
foobar 2005-03-17 13:43:32 +00:00
parent 04d44c8a5c
commit 9c2c04b580
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sapi/cli/php_cli.c
View File

@ -395,7 +395,7 @@ static void php_cli_usage(char *argv0)
}
/* }}} */
static void define_command_line_ini_entry(char *arg TSRMLS_DC)
static int define_command_line_ini_entry(char *arg TSRMLS_DC)
{
char *name, *value;
@ -413,8 +413,9 @@ static void define_command_line_ini_entry(char *arg TSRMLS_DC)
ZVAL_STRING(&extension, value, 0);
php_dl(&extension, MODULE_PERSISTENT, &zval TSRMLS_CC);
} else {
zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
return zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
}
return SUCCESS;
}
@ -661,7 +662,10 @@ int main(int argc, char *argv[])
switch (c) {
case 'd': /* define ini entries on command line */
define_command_line_ini_entry(php_optarg TSRMLS_CC);
if (define_command_line_ini_entry(php_optarg TSRMLS_CC) == FAILURE) {
zend_printf("Invalid php.ini entry '%s'.\n", php_optarg);
goto err;
}
break;
case 'h': /* help & quit */