Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/standard dir.c

[Jani Taskinen]

    Try remember to mention the bug report number in your commit
    messages, and use same message in the HEAD commit too:
    
    - Fixed bug #12345 (foobar). (Hartmut)
    
    This you can easily then copy'paste to NEWS too. (hint!)
    AND NO C++ COMMENTS!!!! </cvs-cop-mode>
    
    --jani
     
    

On Tue, 3 Jun 2003, Hartmut Holzgraefe wrote:

>hholzgra               Tue Jun  3 07:07:40 2003 EDT
>
>  Modified files:              (Branch: PHP_4_3)
>    /php4/ext/standard dir.c 
>  Log:
>  MFH
>  
>Index: php4/ext/standard/dir.c
>diff -u php4/ext/standard/dir.c:1.109.2.5 php4/ext/standard/dir.c:1.109.2.6
>--- php4/ext/standard/dir.c:1.109.2.5  Mon May  5 08:17:02 2003
>+++ php4/ext/standard/dir.c    Tue Jun  3 07:07:40 2003
>@@ -16,7 +16,7 @@
>    +----------------------------------------------------------------------+
>  */
> 
>-/* $Id: dir.c,v 1.109.2.5 2003/05/05 12:17:02 thies Exp $ */
>+/* $Id: dir.c,v 1.109.2.6 2003/06/03 11:07:40 hholzgra Exp $ */
> 
> /* {{{ includes/startup/misc */
> 
>@@ -398,11 +398,16 @@
>               RETURN_FALSE;
>       }
> 
>+#ifndef GLOB_NOMATCH
>+      // now catch the FreeBSD style of "no matches"
>+      if (!globbuf.gl_pathc) {
>+                      array_init(return_value);
>+                      return;
>+      }
>+#endif
>+
>       /* we assume that any glob pattern will match files from one directory only
>          so checking the dirname of the first match should be sufficient */
>-      if (!globbuf.gl_pathv) {
>-              RETURN_FALSE;
>-      }
>       strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
>       if (PG(safe_mode) && (!php_checkuid(cwd, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
>               RETURN_FALSE;
>
>
>
>

-- 
https://www.paypal.com/xclick/[EMAIL PROTECTED]&no_note=1&tax=0&currency_code=EUR
 



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