Hello doc, besides adding --ini this patch alwaysmakes --ri available evenwithout reflection.
best regards marcus Monday, April 23, 2007, 10:17:20 PM, you wrote: > helly Mon Apr 23 20:17:20 2007 UTC > Modified files: > /php-src/sapi/cli php.1.in php_cli.c > Log: > - Add 'php --ini' to CLI which returns the INI file/dir configuration > > http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.17&r2=1.18&diff_format=u > Index: php-src/sapi/cli/php.1.in > diff -u php-src/sapi/cli/php.1.in:1.17 php-src/sapi/cli/php.1.in:1.18 > --- php-src/sapi/cli/php.1.in:1.17 Tue Jan 23 20:02:29 2007 > +++ php-src/sapi/cli/php.1.in Mon Apr 23 20:17:19 2007 > @@ -304,6 +304,9 @@ > .IR name > Shows configuration for extension > .B name > +.TP > +.B \-\-ini > +Show ini configuration files > .SH FILES > .TP 15 > .B php\-cli.ini > http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.171&r2=1.172&diff_format=u > Index: php-src/sapi/cli/php_cli.c > diff -u php-src/sapi/cli/php_cli.c:1.171 php-src/sapi/cli/php_cli.c:1.172 > --- php-src/sapi/cli/php_cli.c:1.171 Tue Apr 17 19:48:16 2007 > +++ php-src/sapi/cli/php_cli.c Mon Apr 23 20:17:19 2007 > @@ -20,7 +20,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_cli.c,v 1.171 2007/04/17 19:48:16 sniper Exp $ */ > +/* $Id: php_cli.c,v 1.172 2007/04/23 20:17:19 helly Exp $ */ > > #include "php.h" > #include "php_globals.h" > @@ -91,21 +91,29 @@ > > #include "php_getopt.h" > > +PHPAPI extern char *php_ini_opened_path; > +PHPAPI extern char *php_ini_scanned_files; > + > #ifndef O_BINARY > #define O_BINARY 0 > #endif > > -#define PHP_MODE_STANDARD 1 > -#define PHP_MODE_HIGHLIGHT 2 > -#define PHP_MODE_INDENT 3 > -#define PHP_MODE_LINT 4 > -#define PHP_MODE_STRIP 5 > -#define PHP_MODE_CLI_DIRECT 6 > -#define PHP_MODE_PROCESS_STDIN 7 > -#define PHP_MODE_REFLECTION_FUNCTION 8 > -#define PHP_MODE_REFLECTION_CLASS 9 > -#define PHP_MODE_REFLECTION_EXTENSION 10 > -#define PHP_MODE_REFLECTION_EXT_INFO 11 > +enum behavior_mode { > + PHP_MODE_STANDARD, > + PHP_MODE_HIGHLIGHT, > +#if 0 /* not yet operational, see also below ... */ > + PHP_MODE_INDENT, > +#endif > + PHP_MODE_LINT, > + PHP_MODE_STRIP, > + PHP_MODE_CLI_DIRECT, > + PHP_MODE_PROCESS_STDIN, > + PHP_MODE_REFLECTION_FUNCTION, > + PHP_MODE_REFLECTION_CLASS, > + PHP_MODE_REFLECTION_EXTENSION, > + PHP_MODE_REFLECTION_EXT_INFO, > + PHP_MODE_SHOW_INI_CONFIG > +}; > > #define HARDCODED_INI \ > "html_errors=0\n" \ > @@ -153,9 +161,10 @@ > {11, 1, "rclass"}, > {12, 1, "re"}, > {12, 1, "rextension"}, > +#endif > {13, 1, "ri"}, > {13, 1, "rextinfo"}, > -#endif > + {14, 0, "ini"}, > {'-', 0, NULL} /* end of args */ > }; > > @@ -459,13 +468,15 @@ > " args... Arguments passed to > script. Use -- args when first argument\n" > " starts with - or script > is read from stdin\n" > "\n" > + " --ini Show ini configuration > files\n" > + "\n" > #if (HAVE_REFLECTION) > " --rf <name> Show information about > function <name>.\n" > " --rc <name> Show information about > class <name>.\n" > " --re <name> Show information about > extension <name>.\n" > +#endif > " --ri <name> Show configuration for > extension <name>.\n" > "\n" > -#endif > , prog, prog, prog, prog, prog, prog); > } > /* }}} */ > @@ -583,7 +594,7 @@ > int c; > zend_file_handle file_handle; > /* temporary locals */ > - int behavior=PHP_MODE_STANDARD; > + enum behavior_mode behavior = PHP_MODE_STANDARD; > #ifdef HAVE_REFLECTION > char *reflection_what = NULL; > #endif > @@ -971,11 +982,14 @@ > behavior=PHP_MODE_REFLECTION_EXTENSION; > reflection_what = php_optarg; > break; > +#endif > case 13: > behavior=PHP_MODE_REFLECTION_EXT_INFO; > reflection_what = php_optarg; > break; > -#endif > + case 14: > + behavior = PHP_MODE_SHOW_INI_CONFIG; > + break; > default: > break; > } > @@ -1243,6 +1257,8 @@ > zend_execute_data execute_data; > > switch (behavior) { > + default: > + break; > case > PHP_MODE_REFLECTION_FUNCTION: > if > (strstr(reflection_what, "::")) { > pce = > reflection_method_ptr; > @@ -1282,6 +1298,7 @@ > > break; > } > +#endif /* reflection */ > case PHP_MODE_REFLECTION_EXT_INFO: > { > int len = strlen(reflection_what); > @@ -1298,7 +1315,14 @@ > efree(lcname); > break; > } > -#endif /* reflection */ > + case PHP_MODE_SHOW_INI_CONFIG: > + { > + zend_printf("Configuration File > (php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH); > + zend_printf("Loaded Configuration > File: %s\n", php_ini_opened_path ? php_ini_opened_path : "(none)"); > + zend_printf("Scan for additional > .ini files in: %s\n", *PHP_CONFIG_FILE_SCAN_DIR ? PHP_CONFIG_FILE_SCAN_DIR : > "(none)"); > + zend_printf("Additional .ini > files parsed: %s\n", php_ini_scanned_files ? php_ini_scanned_files : > "(none)"); > + break; > + } > } > } > Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
