cvs: php-src /ext/standard ftp_fopen_wrapper.c
| From: | Sara Golemon | Date: | Sat, 29 Nov 2003 20:01:02 +0000 |
| Subject: | cvs: php-src /ext/standard ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24758@lists.php.net to get a copy of this message | ||
pollita Sat Nov 29 15:01:02 2003 EDT
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
Add in missing stat element and fix win32 build
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.65 php-src/ext/standard/ftp_fopen_wrapper.c:1.66
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.65 Sat Nov 29 12:16:58 2003
+++ php-src/ext/standard/ftp_fopen_wrapper.c Sat Nov 29 15:01:00 2003
@@ -18,7 +18,7 @@
| Sara Golemon <pollita@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.65 2003/11/29 17:16:58 pollita Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.66 2003/11/29 20:01:00 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -760,6 +760,7 @@
}
ssb->sb.st_ino = 0; /* Unknown values */
+ ssb->sb.st_dev = 0;
ssb->sb.st_uid = 0;
ssb->sb.st_gid = 0;
ssb->sb.st_atime = -1;
@@ -767,9 +768,12 @@
ssb->sb.st_ctime = -1;
ssb->sb.st_nlink = 1;
ssb->sb.st_rdev = -1;
+#ifdef HAVE_ST_BLKSIZE
ssb->sb.st_blksize = 4096; /* Guess since FTP won't expose this information */
- ssb->sb.st_blocks = ceil(ssb->sb.st_size / ssb->sb.st_blksize);
-
+#ifdef HAVE_ST_BLOCKS
+ ssb->sb.st_blocks = (int)((4095 + ssb->sb.st_size) / ssb->sb.st_blksize); /* emulate ceil
*/
+#endif
+#endif
php_stream_close(stream);
php_url_free(resource);
return 0;