From b53da9cd80ce12f37f93e54bf1d232d7c59c1f54 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 29 Jul 2008 10:52:08 +0000 Subject: [PATCH] fix folding --- ext/phar/dirstream.c | 9 ++++++++ ext/phar/phar.c | 27 +++++++++++++++-------- ext/phar/phar.phar | Bin 15239 -> 63966 bytes ext/phar/phar_object.c | 8 +++++-- ext/phar/stream.c | 9 ++++++++ ext/phar/tar.c | 25 ++++++++++++++++----- ext/phar/util.c | 48 ++++++++++++++++++++++++++++++----------- ext/phar/zip.c | 18 +++++++++++++--- 8 files changed, 112 insertions(+), 32 deletions(-) diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index 4635e67fa3..8218c9ca71 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -660,3 +660,12 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, char *url, int options, php_ 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 + */ diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 0cdcc6354d..f9126c7dd0 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -98,7 +98,7 @@ ZEND_INI_MH(phar_ini_modify_handler) /* {{{ */ 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 @@ check_file: 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 @@ int phar_open_from_filename(char *fname, int fname_len, char *alias, int alias_l } /* }}}*/ -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 @@ static inline char *phar_strnstr(const char *buf, int buf_len, const char *searc } } while (1); } +/* }}} */ /** * Scan an open fp for the required __HALT_COMPILER(); ?> token and verify @@ -1601,7 +1603,7 @@ static int phar_open_from_fp(php_stream* fp, char *fname, int fname_len, char *a * 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 @@ static int phar_analyze_path(const char *fname, const char *ext, int ext_len, in 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 @@ static int phar_check_str(const char *fname, const char *ext_str, int ext_len, i } return FAILURE; } +/* }}} */ /* * if executable is 1, only returns SUCCESS if the extension is one of the tar/zip .phar extensions @@ -1885,7 +1889,7 @@ next_extension: } /* }}} */ -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 @@ static int php_check_dots(const char *element, int n) } return 0; } +/* }}} */ #define IS_DIRECTORY_UP(element, len) \ (len >= 2 && !php_check_dots(element, len)) @@ -1905,7 +1910,7 @@ static int php_check_dots(const char *element, int n) #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 @@ static inline int in_character_class(char ch, const char *delim) } 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 @@ char *tsrm_strtok_r(char *s, const char *delim, char **last) } return token; } +/* }}} */ #endif /** @@ -2260,7 +2267,7 @@ static int phar_flush_clean_deleted_apply(void *data TSRMLS_DC) /* {{{ */ #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 @@ char *phar_create_default_stub(const char *index_php, const char *web_index, siz 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 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, return FAILURE; } } +/* }}} */ #endif /* #ifndef PHAR_HAVE_OPENSSL */ /** diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar index 30ad018170c63730cbcb642cdf65bf81ba7fd61b..f95dd4c0dcfe1695d7bcc266e9568a07c1426ad4 100755 GIT binary patch literal 63966 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 delta 13887 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 N68ZuF002iqO+t#jonrt1 diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 2fc16df876..add4495c49 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1174,6 +1174,7 @@ PHP_METHOD(Phar, __construct) #endif /* HAVE_SPL */ } /* }}} */ +/* }}} */ /* {{{ proto array Phar::getSupportedSignatures() * Return array of supported signature types @@ -1675,6 +1676,7 @@ PHP_METHOD(Phar, buildFromDirectory) 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 int phar_copy_file_contents(phar_entry_info *entry, php_stream *fp TSRMLS } /* }}} */ -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 @@ its_ok: 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_METHOD(Phar, delMetadata) 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 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char * 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 diff --git a/ext/phar/stream.c b/ext/phar/stream.c index fe863fd1a5..0c77583e21 100644 --- a/ext/phar/stream.c +++ b/ext/phar/stream.c @@ -972,3 +972,12 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char 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 + */ diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 6bd5e8f4ec..e1e733582d 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -97,7 +97,7 @@ static php_uint32 phar_tar_checksum(char *buf, int len) /* {{{ */ } /* }}} */ -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 @@ int phar_is_tar(char *buf, char *fname) } 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 @@ int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_l } 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 @@ int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRMLS_DC) 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 @@ struct _phar_pass_tar_info { 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 @@ int phar_tar_writeheaders(void *pDest, void *argument TSRMLS_DC) 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 @@ int phar_tar_setmetadata(zval *metadata, phar_entry_info *entry, char **error, p } 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 @@ int phar_tar_setupmetadata(void *pDest, void *argument TSRMLS_DC) 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 @@ nostub: 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 + */ diff --git a/ext/phar/util.c b/ext/phar/util.c index da1a504cf0..d7067e2e8c 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -43,7 +43,7 @@ extern php_stream_wrapper php_stream_phar_wrapper; #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 @@ static char *phar_get_link_location(phar_entry_info *entry TSRMLS_DC) } 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 @@ phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC) 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 @@ php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) 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 @@ int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t positi } 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 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, 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 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char /* }}} */ /* 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 @@ int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) } 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 @@ int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **er } 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 @@ int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TS return SUCCESS; } +/* }}} */ #if defined(PHP_VERSION_ID) && PHP_VERSION_ID < 50202 typedef struct { @@ -996,7 +1004,7 @@ int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, } /* }}} */ -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 @@ int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) 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 @@ phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, } return entry; } +/* }}} */ int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_DC) /* {{{ */ { @@ -1448,7 +1457,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in 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 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature (*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 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t end, 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_update_cached_entry(void *data, void *argument) /* {{{ */ } } } +/* }}} */ static void phar_copy_cached_phar(phar_archive_data **pphar TSRMLS_DC) /* {{{ */ { @@ -2073,3 +2086,12 @@ int phar_copy_on_write(phar_archive_data **pphar TSRMLS_DC) /* {{{ */ 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 + */ diff --git a/ext/phar/zip.c b/ext/phar/zip.c index e0ac5f2668..f235297da9 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -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 @@ static int phar_zip_process_extra(php_stream *fp, phar_entry_info *entry, php_ui } while (len); return SUCCESS; } +/* }}} */ /* extracted from libzip @@ -106,7 +107,7 @@ static int phar_zip_process_extra(php_stream *fp, phar_entry_info *entry, php_ui 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 @@ static time_t phar_zip_d2u_time(int dtime, int ddate) 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 @@ static void phar_zip_u2d_time(time_t time, php_uint16 *dtime, php_uint16 *ddate) *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 @@ nostub: 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 + */ -- 2.50.1