tony2001 Tue Jul 29 10:52:08 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar dirstream.c phar.c phar.phar phar_object.c stream.c tar.c util.c zip.c Log: fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/dirstream.c?r1=1.26.2.6&r2=1.26.2.7&diff_format=u Index: php-src/ext/phar/dirstream.c diff -u php-src/ext/phar/dirstream.c:1.26.2.6 php-src/ext/phar/dirstream.c:1.26.2.7 --- php-src/ext/phar/dirstream.c:1.26.2.6 Sun Jul 20 14:42:34 2008 +++ php-src/ext/phar/dirstream.c Tue Jul 29 10:52:08 2008 @@ -660,3 +660,12 @@ return 1; } /* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.36&r2=1.370.2.37&diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.36 php-src/ext/phar/phar.c:1.370.2.37 --- php-src/ext/phar/phar.c:1.370.2.36 Tue Jul 22 07:03:00 2008 +++ php-src/ext/phar/phar.c Tue Jul 29 10:52:08 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar.c,v 1.370.2.36 2008/07/22 07:03:00 dmitry Exp $ */ +/* $Id: phar.c,v 1.370.2.37 2008/07/29 10:52:08 tony2001 Exp $ */ #define PHAR_MAIN 1 #include "phar_internal.h" @@ -98,7 +98,7 @@ HashTable cached_phars; HashTable cached_alias; -static void phar_split_cache_list(TSRMLS_D) +static void phar_split_cache_list(TSRMLS_D) /* {{{ */ { char *tmp; char *key, *lasts, *end; @@ -1221,6 +1221,7 @@ return phar_create_or_parse_filename(fname, fname_len, alias, alias_len, is_data, options, pphar, error TSRMLS_CC); } +/* }}} */ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC) /* {{{ */ { @@ -1420,7 +1421,7 @@ } /* }}}*/ -static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) +static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */ { const char *c; int so_far = 0; @@ -1442,6 +1443,7 @@ } } while (1); } +/* }}} */ /** * Scan an open fp for the required __HALT_COMPILER(); ?> token and verify @@ -1601,7 +1603,7 @@ * if not, check to see if its dirname() exists (i.e. "/path/to") and is a directory * succeed if we are creating the file, otherwise fail. */ -static int phar_analyze_path(const char *fname, const char *ext, int ext_len, int for_create TSRMLS_DC) +static int phar_analyze_path(const char *fname, const char *ext, int ext_len, int for_create TSRMLS_DC) /* {{{ */ { php_stream_statbuf ssb; char *realpath, old, *a = (char *)(ext + ext_len); @@ -1685,9 +1687,10 @@ return FAILURE; } } +/* }}} */ /* check for ".phar" in extension */ -static int phar_check_str(const char *fname, const char *ext_str, int ext_len, int executable, int for_create TSRMLS_DC) +static int phar_check_str(const char *fname, const char *ext_str, int ext_len, int executable, int for_create TSRMLS_DC) /* {{{ */ { char test[51]; const char *pos; @@ -1723,6 +1726,7 @@ } return FAILURE; } +/* }}} */ /* * if executable is 1, only returns SUCCESS if the extension is one of the tar/zip .phar extensions @@ -1885,7 +1889,7 @@ } /* }}} */ -static int php_check_dots(const char *element, int n) +static int php_check_dots(const char *element, int n) /* {{{ */ { for(n--; n >= 0; --n) { if (element[n] != '.') { @@ -1894,6 +1898,7 @@ } return 0; } +/* }}} */ #define IS_DIRECTORY_UP(element, len) \ (len >= 2 && !php_check_dots(element, len)) @@ -1905,7 +1910,7 @@ #ifdef COMPILE_DL_PHAR /* stupid-ass non-extern declaration in tsrm_strtok.h breaks dumbass MS compiler */ -static inline int in_character_class(char ch, const char *delim) +static inline int in_character_class(char ch, const char *delim) /* {{{ */ { while (*delim) { if (*delim == ch) { @@ -1915,8 +1920,9 @@ } return 0; } +/* }}} */ -char *tsrm_strtok_r(char *s, const char *delim, char **last) +char *tsrm_strtok_r(char *s, const char *delim, char **last) /* {{{ */ { char *token; @@ -1944,6 +1950,7 @@ } return token; } +/* }}} */ #endif /** @@ -2260,7 +2267,7 @@ #include "stub.h" -char *phar_create_default_stub(const char *index_php, const char *web_index, size_t *len, char **error TSRMLS_DC) +char *phar_create_default_stub(const char *index_php, const char *web_index, size_t *len, char **error TSRMLS_DC) /* {{{ */ { char *stub = NULL; int index_len, web_len; @@ -2304,9 +2311,10 @@ phar_get_stub(index_php, web_index, len, &stub, index_len+1, web_len+1 TSRMLS_CC); return stub; } +/* }}} */ #ifndef PHAR_HAVE_OPENSSL -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) /* {{{ */ { zend_fcall_info fci; zend_fcall_info_cache fcc; @@ -2415,6 +2423,7 @@ return FAILURE; } } +/* }}} */ #endif /* #ifndef PHAR_HAVE_OPENSSL */ /** @@ -3461,7 +3470,7 @@ php_info_print_table_header(2, "Phar: PHP Archive support", "enabled"); php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION); php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION); - php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.36 $"); + php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.37 $"); php_info_print_table_row(2, "Phar-based phar archives", "enabled"); php_info_print_table_row(2, "Tar-based phar archives", "enabled"); php_info_print_table_row(2, "ZIP-based phar archives", "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.28&r2=1.7.2.29&diff_format=u Index: php-src/ext/phar/phar.phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.37&r2=1.266.2.38&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.37 php-src/ext/phar/phar_object.c:1.266.2.38 --- php-src/ext/phar/phar_object.c:1.266.2.37 Thu Jul 24 09:22:35 2008 +++ php-src/ext/phar/phar_object.c Tue Jul 29 10:52:08 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar_object.c,v 1.266.2.37 2008/07/24 09:22:35 sfox Exp $ */ +/* $Id: phar_object.c,v 1.266.2.38 2008/07/29 10:52:08 tony2001 Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -1174,6 +1174,7 @@ #endif /* HAVE_SPL */ } /* }}} */ +/* }}} */ /* {{{ proto array Phar::getSupportedSignatures() * Return array of supported signature types @@ -1675,6 +1676,7 @@ php_stream_close(pass.fp); } } +/* }}} */ /* {{{ proto array Phar::buildFromIterator(Iterator iter[, string base_directory]) * Construct a phar archive from an iterator. The iterator must return a series of strings @@ -1807,7 +1809,7 @@ } /* }}} */ -static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC) +static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC) /* {{{ */ { char *oldname = NULL, *oldpath = NULL; char *basename = NULL, *basepath = NULL; @@ -1979,6 +1981,7 @@ return ret; } +/* }}} */ static zval *phar_convert_to_other(phar_archive_data *source, int convert, char *ext, php_uint32 flags TSRMLS_DC) /* {{{ */ { @@ -3655,7 +3658,7 @@ php_check_open_basedir(filename TSRMLS_CC) #endif -static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char *dest, int dest_len, char **error TSRMLS_DC) +static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char *dest, int dest_len, char **error TSRMLS_DC) /* {{{ */ { php_stream_statbuf ssb; int len; @@ -3784,6 +3787,7 @@ efree(fullpath); return SUCCESS; } +/* }}} */ /* {{{ proto bool Phar::extractTo(string pathto[[, mixed files], bool overwrite]) * Extract one or more file from a phar archive, optionally overwriting existing files http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.27.2.10&r2=1.27.2.11&diff_format=u Index: php-src/ext/phar/stream.c diff -u php-src/ext/phar/stream.c:1.27.2.10 php-src/ext/phar/stream.c:1.27.2.11 --- php-src/ext/phar/stream.c:1.27.2.10 Sun Jul 20 14:42:34 2008 +++ php-src/ext/phar/stream.c Tue Jul 29 10:52:08 2008 @@ -972,3 +972,12 @@ return 1; } /* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.16&r2=1.55.2.17&diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.16 php-src/ext/phar/tar.c:1.55.2.17 --- php-src/ext/phar/tar.c:1.55.2.16 Mon Jun 23 03:55:50 2008 +++ php-src/ext/phar/tar.c Tue Jul 29 10:52:08 2008 @@ -97,7 +97,7 @@ } /* }}} */ -int phar_is_tar(char *buf, char *fname) +int phar_is_tar(char *buf, char *fname) /* {{{ */ { tar_header *header = (tar_header *) buf; php_uint32 checksum = phar_tar_number(header->checksum, sizeof(header->checksum)); @@ -119,6 +119,7 @@ } return ret; } +/* }}} */ int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC) /* {{{ */ { @@ -152,8 +153,9 @@ } return FAILURE; } +/* }}} */ -int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRMLS_DC) +int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRMLS_DC) /* {{{ */ { char *metadata; size_t save = php_stream_tell(fp), read; @@ -186,6 +188,7 @@ php_stream_seek(fp, save, SEEK_SET); return SUCCESS; } +/* }}} */ int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC) /* {{{ */ { @@ -555,7 +558,7 @@ char **error; }; -int phar_tar_writeheaders(void *pDest, void *argument TSRMLS_DC) +int phar_tar_writeheaders(void *pDest, void *argument TSRMLS_DC) /* {{{ */ { tar_header header; size_t pos; @@ -674,8 +677,9 @@ entry->offset = entry->offset_abs = pos; return ZEND_HASH_APPLY_KEEP; } +/* }}} */ -int phar_tar_setmetadata(zval *metadata, phar_entry_info *entry, char **error, php_stream *fp TSRMLS_DC) +int phar_tar_setmetadata(zval *metadata, phar_entry_info *entry, char **error, php_stream *fp TSRMLS_DC) /* {{{ */ { php_serialize_data_t metadata_hash; @@ -702,8 +706,9 @@ } return ZEND_HASH_APPLY_KEEP; } +/* }}} */ -int phar_tar_setupmetadata(void *pDest, void *argument TSRMLS_DC) +int phar_tar_setupmetadata(void *pDest, void *argument TSRMLS_DC) /* {{{ */ { int lookfor_len; struct _phar_pass_tar_info *i = (struct _phar_pass_tar_info *)argument; @@ -755,6 +760,7 @@ return phar_tar_setmetadata(entry->metadata, metadata, error, fp TSRMLS_CC); } +/* }}} */ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defaultstub, char **error TSRMLS_DC) /* {{{ */ { @@ -1124,3 +1130,12 @@ return EOF; } /* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.24&r2=1.55.2.25&diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.24 php-src/ext/phar/util.c:1.55.2.25 --- php-src/ext/phar/util.c:1.55.2.24 Sun Jul 27 04:23:00 2008 +++ php-src/ext/phar/util.c Tue Jul 29 10:52:08 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: util.c,v 1.55.2.24 2008/07/27 04:23:00 helly Exp $ */ +/* $Id: util.c,v 1.55.2.25 2008/07/29 10:52:08 tony2001 Exp $ */ #include "phar_internal.h" @@ -43,7 +43,7 @@ #endif /* for links to relative location, prepend cwd of the entry */ -static char *phar_get_link_location(phar_entry_info *entry TSRMLS_DC) +static char *phar_get_link_location(phar_entry_info *entry TSRMLS_DC) /* {{{ */ { char *p, *ret = NULL; if (!entry->link) { @@ -60,8 +60,9 @@ } return entry->link; } +/* }}} */ -phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) +phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) /* {{{ */ { phar_entry_info *link_entry; char *link = phar_get_link_location(entry TSRMLS_CC); @@ -83,9 +84,10 @@ return NULL; } } +/* }}} */ /* retrieve a phar_entry_info's current file pointer for reading contents */ -php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) +php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) /* {{{ */ { if (follow_links && entry->link) { phar_entry_info *link_entry = phar_get_link_source(entry TSRMLS_CC); @@ -112,8 +114,9 @@ return entry->fp; } } +/* }}} */ -int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t position, int follow_links TSRMLS_DC) +int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t position, int follow_links TSRMLS_DC) /* {{{ */ { php_stream *fp = phar_get_efp(entry, follow_links TSRMLS_CC); off_t temp, eoffset; @@ -151,9 +154,10 @@ } return php_stream_seek(fp, temp, SEEK_SET); } +/* }}} */ /* mount an absolute path or uri to a path internal to the phar archive */ -int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len TSRMLS_DC) +int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len TSRMLS_DC) /* {{{ */ { phar_entry_info entry = {0}; php_stream_statbuf ssb; @@ -230,6 +234,7 @@ efree(entry.filename); return FAILURE; } +/* }}} */ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_data **pphar TSRMLS_DC) /* {{{ */ { @@ -775,7 +780,7 @@ /* }}} */ /* initialize a phar_archive_data's read-only fp for existing phar data */ -int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) +int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) /* {{{ */ { if (phar_get_pharfp(phar TSRMLS_CC)) { return SUCCESS; @@ -798,9 +803,10 @@ } return SUCCESS; } +/* }}} */ /* copy file data from an existing to a new phar_entry_info that is not in the manifest */ -int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error TSRMLS_DC) +int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error TSRMLS_DC) /* {{{ */ { phar_entry_info *link; @@ -832,10 +838,11 @@ } return SUCCESS; } +/* }}} */ /* open and decompress a compressed phar entry */ -int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TSRMLS_DC) +int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TSRMLS_DC) /* {{{ */ { php_stream_filter *filter; phar_archive_data *phar = entry->phar; @@ -912,6 +919,7 @@ return SUCCESS; } +/* }}} */ #if defined(PHP_VERSION_ID) && PHP_VERSION_ID < 50202 typedef struct { @@ -996,7 +1004,7 @@ } /* }}} */ -int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) +int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{{ */ { php_stream *fp; phar_entry_info *link; @@ -1034,12 +1042,12 @@ entry->is_modified = 1; return SUCCESS; } +/* }}} */ /** * helper function to open an internal file's fp just-in-time */ -phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, php_stream *fp, - char **error, int for_write TSRMLS_DC) +phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, php_stream *fp, char **error, int for_write TSRMLS_DC) /* {{{ */ { if (error) { *error = NULL; @@ -1054,6 +1062,7 @@ } return entry; } +/* }}} */ int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_DC) /* {{{ */ { @@ -1448,7 +1457,7 @@ static const char hexChars[] = "0123456789ABCDEF"; -static int phar_hex_str(const char *digest, size_t digest_len, char **signature TSRMLS_DC) +static int phar_hex_str(const char *digest, size_t digest_len, char **signature TSRMLS_DC) /* {{{ */ { int pos = -1; size_t len = 0; @@ -1462,8 +1471,10 @@ (*signature)[++pos] = '\0'; return pos; } +/* }}} */ + #ifndef PHAR_HAVE_OPENSSL -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) /* {{{ */ { zend_fcall_info fci; zend_fcall_info_cache fcc; @@ -1572,6 +1583,7 @@ return FAILURE; } } +/* }}} */ #endif /* #ifndef PHAR_HAVE_OPENSSL */ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC) /* {{{ */ @@ -2001,6 +2013,7 @@ } } } +/* }}} */ static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */ { @@ -2073,3 +2086,12 @@ return SUCCESS; } /* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.14&r2=1.47.2.15&diff_format=u Index: php-src/ext/phar/zip.c diff -u php-src/ext/phar/zip.c:1.47.2.14 php-src/ext/phar/zip.c:1.47.2.15 --- php-src/ext/phar/zip.c:1.47.2.14 Thu Jul 17 13:22:32 2008 +++ php-src/ext/phar/zip.c Tue Jul 29 10:52:08 2008 @@ -34,7 +34,7 @@ # define PHAR_SET_16(buffer) (buffer) #endif -static int phar_zip_process_extra(php_stream *fp, phar_entry_info *entry, php_uint16 len TSRMLS_DC) +static int phar_zip_process_extra(php_stream *fp, phar_entry_info *entry, php_uint16 len TSRMLS_DC) /* {{{ */ { union { phar_zip_extra_field_header header; @@ -72,6 +72,7 @@ } while (len); return SUCCESS; } +/* }}} */ /* extracted from libzip @@ -106,7 +107,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -static time_t phar_zip_d2u_time(int dtime, int ddate) +static time_t phar_zip_d2u_time(int dtime, int ddate) /* {{{ */ { struct tm *tm, tmbuf; time_t now; @@ -124,8 +125,9 @@ return mktime(tm); } +/* }}} */ -static void phar_zip_u2d_time(time_t time, php_uint16 *dtime, php_uint16 *ddate) +static void phar_zip_u2d_time(time_t time, php_uint16 *dtime, php_uint16 *ddate) /* {{{ */ { struct tm *tm, tmbuf; @@ -133,6 +135,7 @@ *ddate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday; *dtime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) + ((tm->tm_sec)>>1); } +/* }}} */ /** * Does not check for a previously opened phar in the cache. @@ -1142,3 +1145,12 @@ return EOF; } /* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php