subject:"Re\: \[PHP\-CVS\] cvs\: php\-src \/sapi\/cli php.1.in php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

2009-04-09 Thread Hannes Magnusson

On Thu, Apr 9, 2009 at 12:12, Jani Taskinen jani.taski...@sci.fi wrote:
 Hannes Magnusson wrote:

 bjori           Thu Apr  9 10:07:24 2009 UTC

  Modified files:                  /php-src/sapi/cli   php_cli.c php.1.in
  Log:
  Fixed bug#47427 (-s outputs, not displays)

  http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.208r2=1.209diff_format=u
 Index: php-src/sapi/cli/php_cli.c
 diff -u php-src/sapi/cli/php_cli.c:1.208 php-src/sapi/cli/php_cli.c:1.209
 --- php-src/sapi/cli/php_cli.c:1.208    Wed Apr  8 00:14:37 2009
 +++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:07:24 2009
 @@ -20,7 +20,7 @@

  +--+
  */
  -/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */
 +/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
   #include php.h
  #include php_globals.h
 @@ -510,9 +510,9 @@
                                  -F file        Parse and execute
 file for every input line\n
                                  -E end_code    Run PHP end_code
 after processing all input lines\n
                                  -H               Hide any passed
 arguments from external tools.\n
 -                                 -s               Display colour syntax
 highlighted source.\n
 +                                 -s               Outputs HTML syntax
 highlighted source.\n

 That should be Output HTML.., too many s'. :)

Fixed, thanks :)

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

2009-04-09 Thread Jani Taskinen


Hannes Magnusson wrote:

bjori   Thu Apr  9 10:07:24 2009 UTC

  Modified files:  
/php-src/sapi/cli	php_cli.c php.1.in 
  Log:

  Fixed bug#47427 (-s outputs, not displays)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.208r2=1.209diff_format=u

Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.208 php-src/sapi/cli/php_cli.c:1.209
--- php-src/sapi/cli/php_cli.c:1.208Wed Apr  8 00:14:37 2009
+++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:07:24 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */

+/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
 
 #include php.h

 #include php_globals.h
@@ -510,9 +510,9 @@
  -F fileParse and execute file for 
every input line\n
  -E end_codeRun PHP end_code after 
processing all input lines\n
  -H   Hide any passed arguments from 
external tools.\n
- -s   Display colour syntax 
highlighted source.\n
+ -s   Outputs HTML syntax highlighted 
source.\n


That should be Output HTML.., too many s'. :)



  -v   Version number\n
- -w   Display source with stripped 
comments and whitespace.\n
+ -w   Outputs source with stripped 
comments and whitespace.\n


Same here..


  -z fileLoad Zend extension 
file.\n
\n
  args...  Arguments passed to script. Use 
-- args when first argument\n
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.23r2=1.24diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.23 php-src/sapi/cli/php.1.in:1.24
--- php-src/sapi/cli/php.1.in:1.23  Wed Dec 31 11:12:39 2008
+++ php-src/sapi/cli/php.1.in   Thu Apr  9 10:07:24 2009
@@ -233,7 +233,7 @@
 .TP
 .PD 1
 .B \-s
-Display colour syntax highlighted source
+Outputs HTML syntax highlighted source
 .TP
 .PD 0
 .B \-\-version
@@ -247,7 +247,7 @@
 .TP
 .PD 1
 .B \-w
-Display source with stripped comments and whitespace
+Outputs source with stripped comments and whitespace
 .TP
 .PD 0
 .B \-\-zend\-extension \fIfile\fP






--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

2007-04-23 Thread Marcus Boerger

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.17r2=1.18diff_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.171r2=1.172diff_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.171Tue 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_INDENT3
 -#define PHP_MODE_LINT  4
 -#define PHP_MODE_STRIP 5
 -#define PHP_MODE_CLI_DIRECT6
 -#define PHP_MODE_PROCESS_STDIN 7
 -#define PHP_MODE_REFLECTION_FUNCTION8
 -#define PHP_MODE_REFLECTION_CLASS   9
 -#define PHP_MODE_REFLECTION_EXTENSION   10
 -#define PHP_MODE_REFLECTION_EXT_INFO11
 +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
 + --iniShow 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:
 +

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

3 matches

Site Navigation

Mail list logo

Footer information