[PHP-CVS] cvs: php-src(PHP_5_0) /ext/spl spl_directory.c

2004-10-30 Thread Marcus Boerger 
helly   Sat Oct 30 10:35:01 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/splspl_directory.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.26.2.1r2=1.26.2.2ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.26.2.1 
php-src/ext/spl/spl_directory.c:1.26.2.2
--- php-src/ext/spl/spl_directory.c:1.26.2.1Fri Sep  3 14:41:10 2004
+++ php-src/ext/spl/spl_directory.c Sat Oct 30 10:35:01 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.26.2.1 2004/09/03 18:41:10 helly Exp $ */
+/* $Id: spl_directory.c,v 1.26.2.2 2004/10/30 14:35:01 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -120,9 +120,15 @@
 /* open a directory resource */
 static void spl_ce_dir_open(spl_ce_dir_object* intern, char *path TSRMLS_DC)
 {
+   int path_len = strlen(path);
+
intern-dirp = php_stream_opendir(path, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
 
-   intern-path = estrdup(path);
+   if (path_len  (path[path_len-1] == '/' || path[path_len-1] == '\\')) {
+   intern-path = estrndup(path, --path_len);
+   } else {
+   intern-path = estrndup(path, path_len);
+   }
intern-index = 0;
 
if (intern-dirp == NULL) {

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/spl spl_directory.c

2004-09-03 Thread Marcus Boerger 
helly   Fri Sep  3 14:41:10 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/splspl_directory.c 
  Log:
  MFH: Fix protoe's
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.26r2=1.26.2.1ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.26 php-src/ext/spl/spl_directory.c:1.26.2.1
--- php-src/ext/spl/spl_directory.c:1.26Wed Jun 16 19:57:25 2004
+++ php-src/ext/spl/spl_directory.c Fri Sep  3 14:41:10 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.26 2004/06/16 23:57:25 abies Exp $ */
+/* $Id: spl_directory.c,v 1.26.2.1 2004/09/03 18:41:10 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -341,47 +341,47 @@
 }
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::filePerms()
+/* {{{ proto int DirectoryIterator::getPerms()
Get file permissions */
 FileFunction(getPerms, FS_PERMS)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileInode()
+/* {{{ proto int DirectoryIterator::getInode()
Get file inode */
 FileFunction(getInode, FS_INODE)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileSize()
+/* {{{ proto int DirectoryIterator::getSize()
Get file size */
 FileFunction(getSize, FS_SIZE)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileOwner()
+/* {{{ proto int DirectoryIterator::getOwner()
Get file owner */
 FileFunction(getOwner, FS_OWNER)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileGroup()
+/* {{{ proto int DirectoryIterator::getGroup()
Get file group */
 FileFunction(getGroup, FS_GROUP)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileATime()
+/* {{{ proto int DirectoryIterator::getATime()
Get last access time of file */
 FileFunction(getATime, FS_ATIME)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileMTime()
+/* {{{ proto int DirectoryIterator::getMTime()
Get last modification time of file */
 FileFunction(getMTime, FS_MTIME)
 /* }}} */
 
-/* {{{ proto int DirectoryIterator::fileCTime()
+/* {{{ proto int DirectoryIterator::getCTime()
Get inode modification time of file */
 FileFunction(getCTime, FS_CTIME)
 /* }}} */
 
-/* {{{ proto string DirectoryIterator::fileType()
+/* {{{ proto string DirectoryIterator::getType()
Get file type */
 FileFunction(getType, FS_TYPE)
 /* }}} */

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