diff options
54 files changed, 200 insertions, 183 deletions
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 2880f6b216..a8ae4f1223 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -31,6 +31,7 @@ if (PHP_ZIP != "no") { AC_DEFINE('HAVE_ZLIB', 1); AC_DEFINE('HAVE_ZIP', 1); + ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS "); } else { WARNING("zip not enabled; libraries and headers not found"); } diff --git a/ext/zip/lib/zip.h b/ext/zip/lib/zip.h index b59610bfef..04ffb1471b 100644 --- a/ext/zip/lib/zip.h +++ b/ext/zip/lib/zip.h @@ -37,16 +37,24 @@ */ - -#ifdef __cplusplus -extern "C" { +#include "main/php.h" +/* #defines that rename all zip_ functions and structs */ +#include "zip_alias.h" +#ifdef PHP_WIN32 +#include "zip_win32.h" +# ifdef PHP_ZIP_EXPORTS +# define PHPZIPAPI __declspec(dllexport) +# else +# define PHPZIPAPI +# endif +#else +#define PHPZIPAPI #endif - +BEGIN_EXTERN_C() #include <sys/types.h> #include <stdio.h> #include <time.h> -#include "zip_win32.h" /* flags for zip_open */ @@ -162,49 +170,46 @@ struct zip_source; -int zip_add(struct zip *, const char *, struct zip_source *); -int zip_add_dir(struct zip *, const char *); -int zip_close(struct zip *); -int zip_delete(struct zip *, int); -void zip_error_clear(struct zip *); -void zip_error_get(struct zip *, int *, int *); -int zip_error_get_sys_type(int); -int zip_error_to_str(char *, size_t, int, int); -int zip_fclose(struct zip_file *); -void zip_file_error_clear(struct zip_file *); -void zip_file_error_get(struct zip_file *, int *, int *); -const char *zip_file_strerror(struct zip_file *); -struct zip_file *zip_fopen(struct zip *, const char *, int); -struct zip_file *zip_fopen_index(struct zip *, int, int); -ssize_t zip_fread(struct zip_file *, void *, size_t); -const char *zip_get_archive_comment(struct zip *, int *, int); -const char *zip_get_file_comment(struct zip *, int, int *, int); -const char *zip_get_name(struct zip *, int, int); -int zip_get_num_files(struct zip *); -int zip_name_locate(struct zip *, const char *, int); -struct zip *zip_open(const char *, int, int *); -int zip_rename(struct zip *, int, const char *); -int zip_replace(struct zip *, int, struct zip_source *); -int zip_set_archive_comment(struct zip *, const char *, int); -int zip_set_file_comment(struct zip *, int, const char *, int); -struct zip_source *zip_source_buffer(struct zip *, const void *, off_t, int); -struct zip_source *zip_source_file(struct zip *, const char *, off_t, off_t); -struct zip_source *zip_source_filep(struct zip *, FILE *, off_t, off_t); -void zip_source_free(struct zip_source *); -struct zip_source *zip_source_function(struct zip *, +PHPZIPAPI int zip_add(struct zip *, const char *, struct zip_source *); +PHPZIPAPI int zip_add_dir(struct zip *, const char *); +PHPZIPAPI int zip_close(struct zip *); +PHPZIPAPI int zip_delete(struct zip *, int); +PHPZIPAPI void zip_error_clear(struct zip *); +PHPZIPAPI void zip_error_get(struct zip *, int *, int *); +PHPZIPAPI int zip_error_get_sys_type(int); +PHPZIPAPI int zip_error_to_str(char *, size_t, int, int); +PHPZIPAPI int zip_fclose(struct zip_file *); +PHPZIPAPI void zip_file_error_clear(struct zip_file *); +PHPZIPAPI void zip_file_error_get(struct zip_file *, int *, int *); +PHPZIPAPI const char *zip_file_strerror(struct zip_file *); +PHPZIPAPI struct zip_file *zip_fopen(struct zip *, const char *, int); +PHPZIPAPI struct zip_file *zip_fopen_index(struct zip *, int, int); +PHPZIPAPI ssize_t zip_fread(struct zip_file *, void *, size_t); +PHPZIPAPI const char *zip_get_archive_comment(struct zip *, int *, int); +PHPZIPAPI const char *zip_get_file_comment(struct zip *, int, int *, int); +PHPZIPAPI const char *zip_get_name(struct zip *, int, int); +PHPZIPAPI int zip_get_num_files(struct zip *); +PHPZIPAPI int zip_name_locate(struct zip *, const char *, int); +PHPZIPAPI struct zip *zip_open(const char *, int, int *); +PHPZIPAPI int zip_rename(struct zip *, int, const char *); +PHPZIPAPI int zip_replace(struct zip *, int, struct zip_source *); +PHPZIPAPI int zip_set_archive_comment(struct zip *, const char *, int); +PHPZIPAPI int zip_set_file_comment(struct zip *, int, const char *, int); +PHPZIPAPI struct zip_source *zip_source_buffer(struct zip *, const void *, off_t, int); +PHPZIPAPI struct zip_source *zip_source_file(struct zip *, const char *, off_t, off_t); +PHPZIPAPI struct zip_source *zip_source_filep(struct zip *, FILE *, off_t, off_t); +PHPZIPAPI void zip_source_free(struct zip_source *); +PHPZIPAPI struct zip_source *zip_source_function(struct zip *, zip_source_callback, void *); -struct zip_source *zip_source_zip(struct zip *, struct zip *, int, int, +PHPZIPAPI struct zip_source *zip_source_zip(struct zip *, struct zip *, int, int, off_t, off_t); -int zip_stat(struct zip *, const char *, int, struct zip_stat *); -int zip_stat_index(struct zip *, int, int, struct zip_stat *); -void zip_stat_init(struct zip_stat *); -const char *zip_strerror(struct zip *); -int zip_unchange(struct zip *, int); -int zip_unchange_all(struct zip *); -int zip_unchange_archive(struct zip *); - -#ifdef __cplusplus -} -#endif - +PHPZIPAPI int zip_stat(struct zip *, const char *, int, struct zip_stat *); +PHPZIPAPI int zip_stat_index(struct zip *, int, int, struct zip_stat *); +PHPZIPAPI void zip_stat_init(struct zip_stat *); +PHPZIPAPI const char *zip_strerror(struct zip *); +PHPZIPAPI int zip_unchange(struct zip *, int); +PHPZIPAPI int zip_unchange_all(struct zip *); +PHPZIPAPI int zip_unchange_archive(struct zip *); + +END_EXTERN_C(); #endif /* _HAD_ZIP_H */ diff --git a/ext/zip/lib/zip_add.c b/ext/zip/lib/zip_add.c index 535d6e4689..70d1162f7f 100644 --- a/ext/zip/lib/zip_add.c +++ b/ext/zip/lib/zip_add.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_add(struct zip *za, const char *name, struct zip_source *source) { if (name == NULL || source == NULL) { diff --git a/ext/zip/lib/zip_add_dir.c b/ext/zip/lib/zip_add_dir.c index 287ec4bab2..d4da559ecd 100644 --- a/ext/zip/lib/zip_add_dir.c +++ b/ext/zip/lib/zip_add_dir.c @@ -43,7 +43,7 @@ -int +PHPZIPAPI int zip_add_dir(struct zip *za, const char *name) { int len, ret; diff --git a/ext/zip/lib/zip_close.c b/ext/zip/lib/zip_close.c index e701321a81..11ba8e2231 100644 --- a/ext/zip/lib/zip_close.c +++ b/ext/zip/lib/zip_close.c @@ -56,7 +56,7 @@ static int _zip_cdir_set_comment(struct zip_cdir *, struct zip *); static int _zip_changed(struct zip *, int *); static char *_zip_create_temp_output(struct zip *, FILE **); -int +PHPZIPAPI int zip_close(struct zip *za) { int survivors; diff --git a/ext/zip/lib/zip_delete.c b/ext/zip/lib/zip_delete.c index 7244e612f7..eb5055b687 100644 --- a/ext/zip/lib/zip_delete.c +++ b/ext/zip/lib/zip_delete.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_delete(struct zip *za, int idx) { if (idx < 0 || idx >= za->nentry) { diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c index 8423ad5343..f796f8d669 100644 --- a/ext/zip/lib/zip_dirent.c +++ b/ext/zip/lib/zip_dirent.c @@ -56,7 +56,7 @@ static void _zip_write4(unsigned int, FILE *); -void +PHPZIPAPI void _zip_cdir_free(struct zip_cdir *cd) { int i; @@ -73,7 +73,7 @@ _zip_cdir_free(struct zip_cdir *cd) -struct zip_cdir * +PHPZIPAPI struct zip_cdir * _zip_cdir_new(int nentry, struct zip_error *error) { struct zip_cdir *cd; @@ -102,7 +102,7 @@ _zip_cdir_new(int nentry, struct zip_error *error) -int +PHPZIPAPI int _zip_cdir_write(struct zip_cdir *cd, FILE *fp, struct zip_error *error) { int i; @@ -136,7 +136,7 @@ _zip_cdir_write(struct zip_cdir *cd, FILE *fp, struct zip_error *error) -void +PHPZIPAPI void _zip_dirent_finalize(struct zip_dirent *zde) { free(zde->filename); @@ -149,7 +149,7 @@ _zip_dirent_finalize(struct zip_dirent *zde) -void +PHPZIPAPI void _zip_dirent_init(struct zip_dirent *de) { de->version_madeby = 0; @@ -188,7 +188,7 @@ _zip_dirent_init(struct zip_dirent *de) returned. */ -int +PHPZIPAPI int _zip_dirent_read(struct zip_dirent *zde, FILE *fp, unsigned char **bufp, unsigned int left, int localp, struct zip_error *error) @@ -333,7 +333,7 @@ _zip_dirent_read(struct zip_dirent *zde, FILE *fp, returned. */ -int +PHPZIPAPI int _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp, struct zip_error *error) { @@ -409,7 +409,7 @@ _zip_d2u_time(int dtime, int ddate) -unsigned short +PHPZIPAPI unsigned short _zip_read2(unsigned char **a) { unsigned short ret; @@ -422,7 +422,7 @@ _zip_read2(unsigned char **a) -unsigned int +PHPZIPAPI unsigned int _zip_read4(unsigned char **a) { unsigned int ret; diff --git a/ext/zip/lib/zip_entry_free.c b/ext/zip/lib/zip_entry_free.c index 48443cefd5..1bab313ed5 100644 --- a/ext/zip/lib/zip_entry_free.c +++ b/ext/zip/lib/zip_entry_free.c @@ -42,7 +42,7 @@ -void +PHPZIPAPI void _zip_entry_free(struct zip_entry *ze) { free(ze->ch_filename); diff --git a/ext/zip/lib/zip_entry_new.c b/ext/zip/lib/zip_entry_new.c index 390b72ad70..67e13fd84a 100644 --- a/ext/zip/lib/zip_entry_new.c +++ b/ext/zip/lib/zip_entry_new.c @@ -42,7 +42,7 @@ -struct zip_entry * +PHPZIPAPI struct zip_entry * _zip_entry_new(struct zip *za) { struct zip_entry *ze; diff --git a/ext/zip/lib/zip_error.c b/ext/zip/lib/zip_error.c index fe04778691..4816b73aea 100644 --- a/ext/zip/lib/zip_error.c +++ b/ext/zip/lib/zip_error.c @@ -42,7 +42,7 @@ -void +PHPZIPAPI void _zip_error_clear(struct zip_error *err) { err->zip_err = ZIP_ER_OK; @@ -51,7 +51,7 @@ _zip_error_clear(struct zip_error *err) -void +PHPZIPAPI void _zip_error_copy(struct zip_error *dst, struct zip_error *src) { dst->zip_err = src->zip_err; @@ -60,7 +60,7 @@ _zip_error_copy(struct zip_error *dst, struct zip_error *src) -void +PHPZIPAPI void _zip_error_fini(struct zip_error *err) { free(err->str); @@ -69,7 +69,7 @@ _zip_error_fini(struct zip_error *err) -void +PHPZIPAPI void _zip_error_get(struct zip_error *err, int *zep, int *sep) { if (zep) @@ -84,7 +84,7 @@ _zip_error_get(struct zip_error *err, int *zep, int *sep) -void +PHPZIPAPI void _zip_error_init(struct zip_error *err) { err->zip_err = ZIP_ER_OK; @@ -94,7 +94,7 @@ _zip_error_init(struct zip_error *err) -void +PHPZIPAPI void _zip_error_set(struct zip_error *err, int ze, int se) { if (err) { diff --git a/ext/zip/lib/zip_error_clear.c b/ext/zip/lib/zip_error_clear.c index 337335b6cb..8a76f44400 100644 --- a/ext/zip/lib/zip_error_clear.c +++ b/ext/zip/lib/zip_error_clear.c @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_error_clear(struct zip *za) { _zip_error_clear(&za->error); diff --git a/ext/zip/lib/zip_error_get.c b/ext/zip/lib/zip_error_get.c index 712575a864..888b545693 100644 --- a/ext/zip/lib/zip_error_get.c +++ b/ext/zip/lib/zip_error_get.c @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_error_get(struct zip *za, int *zep, int *sep) { _zip_error_get(&za->error, zep, sep); diff --git a/ext/zip/lib/zip_error_get_sys_type.c b/ext/zip/lib/zip_error_get_sys_type.c index 613ec94328..bfe6423836 100644 --- a/ext/zip/lib/zip_error_get_sys_type.c +++ b/ext/zip/lib/zip_error_get_sys_type.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_error_get_sys_type(int ze) { if (ze < 0 || ze >= _zip_nerr_str) diff --git a/ext/zip/lib/zip_error_strerror.c b/ext/zip/lib/zip_error_strerror.c index e6eee081df..06e98c76d8 100644 --- a/ext/zip/lib/zip_error_strerror.c +++ b/ext/zip/lib/zip_error_strerror.c @@ -45,7 +45,7 @@ -const char * +PHPZIPAPI const char * _zip_error_strerror(struct zip_error *err) { const char *zs, *ss; diff --git a/ext/zip/lib/zip_error_to_str.c b/ext/zip/lib/zip_error_to_str.c index e566192255..665803472e 100644 --- a/ext/zip/lib/zip_error_to_str.c +++ b/ext/zip/lib/zip_error_to_str.c @@ -45,7 +45,7 @@ -int +PHPZIPAPI int zip_error_to_str(char *buf, size_t len, int ze, int se) { const char *zs, *ss; diff --git a/ext/zip/lib/zip_fclose.c b/ext/zip/lib/zip_fclose.c index c0105a9290..91f30b7bb9 100644 --- a/ext/zip/lib/zip_fclose.c +++ b/ext/zip/lib/zip_fclose.c @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_fclose(struct zip_file *zf) { int i, ret; diff --git a/ext/zip/lib/zip_file_error_clear.c b/ext/zip/lib/zip_file_error_clear.c index e5359114a9..dca33b35f7 100644 --- a/ext/zip/lib/zip_file_error_clear.c +++ b/ext/zip/lib/zip_file_error_clear.c @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_file_error_clear(struct zip_file *zf) { _zip_error_clear(&zf->error); diff --git a/ext/zip/lib/zip_file_error_get.c b/ext/zip/lib/zip_file_error_get.c index 2ab3a73a4c..05516703c6 100644 --- a/ext/zip/lib/zip_file_error_get.c +++ b/ext/zip/lib/zip_file_error_get.c @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_file_error_get(struct zip_file *zf, int *zep, int *sep) { _zip_error_get(&zf->error, zep, sep); diff --git a/ext/zip/lib/zip_file_get_offset.c b/ext/zip/lib/zip_file_get_offset.c index 8bcc64934d..4930040235 100644 --- a/ext/zip/lib/zip_file_get_offset.c +++ b/ext/zip/lib/zip_file_get_offset.c @@ -56,7 +56,7 @@ On error, fills in za->error and returns 0. */ -unsigned int +PHPZIPAPI unsigned int _zip_file_get_offset(struct zip *za, int idx) { struct zip_dirent de; diff --git a/ext/zip/lib/zip_file_strerror.c b/ext/zip/lib/zip_file_strerror.c index aaff189996..2cc79c1333 100644 --- a/ext/zip/lib/zip_file_strerror.c +++ b/ext/zip/lib/zip_file_strerror.c @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_file_strerror(struct zip_file *zf) { return _zip_error_strerror(&zf->error); diff --git a/ext/zip/lib/zip_fopen.c b/ext/zip/lib/zip_fopen.c index 850a8d835a..c05ad45bd6 100644 --- a/ext/zip/lib/zip_fopen.c +++ b/ext/zip/lib/zip_fopen.c @@ -40,7 +40,7 @@ -struct zip_file * +PHPZIPAPI struct zip_file * zip_fopen(struct zip *za, const char *fname, int flags) { int idx; diff --git a/ext/zip/lib/zip_fopen_index.c b/ext/zip/lib/zip_fopen_index.c index 5da9230b2e..105cefe738 100644 --- a/ext/zip/lib/zip_fopen_index.c +++ b/ext/zip/lib/zip_fopen_index.c @@ -46,7 +46,7 @@ static struct zip_file *_zip_file_new(struct zip *za); -struct zip_file * +PHPZIPAPI struct zip_file * zip_fopen_index(struct zip *za, int fileno, int flags) { int len, ret; @@ -141,7 +141,7 @@ zip_fopen_index(struct zip *za, int fileno, int flags) -int +PHPZIPAPI int _zip_file_fillbuf(void *buf, size_t buflen, struct zip_file *zf) { int i, j; diff --git a/ext/zip/lib/zip_fread.c b/ext/zip/lib/zip_fread.c index aeb64c90fa..064d2b97fb 100644 --- a/ext/zip/lib/zip_fread.c +++ b/ext/zip/lib/zip_fread.c @@ -40,7 +40,7 @@ -ssize_t +PHPZIPAPI ssize_t zip_fread(struct zip_file *zf, void *outbuf, size_t toread) { int ret; diff --git a/ext/zip/lib/zip_free.c b/ext/zip/lib/zip_free.c index c78697d254..534c58eb07 100644 --- a/ext/zip/lib/zip_free.c +++ b/ext/zip/lib/zip_free.c @@ -45,7 +45,7 @@ frees the space allocated to a zipfile struct, and closes the corresponding file. */ -void +PHPZIPAPI void _zip_free(struct zip *za) { int i; diff --git a/ext/zip/lib/zip_get_archive_comment.c b/ext/zip/lib/zip_get_archive_comment.c index 7844c5e191..c23597c096 100644 --- a/ext/zip/lib/zip_get_archive_comment.c +++ b/ext/zip/lib/zip_get_archive_comment.c @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_archive_comment(struct zip *za, int *lenp, int flags) { if ((flags & ZIP_FL_UNCHANGED) diff --git a/ext/zip/lib/zip_get_file_comment.c b/ext/zip/lib/zip_get_file_comment.c index 79a5c236bc..476ac7da0b 100644 --- a/ext/zip/lib/zip_get_file_comment.c +++ b/ext/zip/lib/zip_get_file_comment.c @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_file_comment(struct zip *za, int idx, int *lenp, int flags) { if (idx < 0 || idx >= za->nentry) { diff --git a/ext/zip/lib/zip_get_name.c b/ext/zip/lib/zip_get_name.c index c45dd0333f..c2cae2518e 100644 --- a/ext/zip/lib/zip_get_name.c +++ b/ext/zip/lib/zip_get_name.c @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_name(struct zip *za, int idx, int flags) { return _zip_get_name(za, idx, flags, &za->error); @@ -48,7 +48,7 @@ zip_get_name(struct zip *za, int idx, int flags) -const char * +PHPZIPAPI const char * _zip_get_name(struct zip *za, int idx, int flags, struct zip_error *error) { if (idx < 0 || idx >= za->nentry) { diff --git a/ext/zip/lib/zip_get_num_files.c b/ext/zip/lib/zip_get_num_files.c index 0cc81edb06..05a54fcb6c 100644 --- a/ext/zip/lib/zip_get_num_files.c +++ b/ext/zip/lib/zip_get_num_files.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_get_num_files(struct zip *za) { if (za == NULL) diff --git a/ext/zip/lib/zip_memdup.c b/ext/zip/lib/zip_memdup.c index c4ecf4a69f..ebb7426dd2 100644 --- a/ext/zip/lib/zip_memdup.c +++ b/ext/zip/lib/zip_memdup.c @@ -41,7 +41,7 @@ -void * +PHPZIPAPI void * _zip_memdup(const void *mem, size_t len, struct zip_error *error) { void *ret; diff --git a/ext/zip/lib/zip_name_locate.c b/ext/zip/lib/zip_name_locate.c index a2fce2d034..108db4f609 100644 --- a/ext/zip/lib/zip_name_locate.c +++ b/ext/zip/lib/zip_name_locate.c @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_name_locate(struct zip *za, const char *fname, int flags) { return _zip_name_locate(za, fname, flags, &za->error); @@ -50,7 +50,7 @@ zip_name_locate(struct zip *za, const char *fname, int flags) -int +PHPZIPAPI int _zip_name_locate(struct zip *za, const char *fname, int flags, struct zip_error *error) { @@ -62,8 +62,11 @@ _zip_name_locate(struct zip *za, const char *fname, int flags, _zip_error_set(error, ZIP_ER_INVAL, 0); return -1; } - - cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; +#ifdef PHP_WIN32 + cmp = (flags & ZIP_FL_NOCASE) ? stricmp : strcmp; +#else + cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; +#endif n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry; for (i=0; i<n; i++) { diff --git a/ext/zip/lib/zip_new.c b/ext/zip/lib/zip_new.c index 660183a15c..378513b6cf 100644 --- a/ext/zip/lib/zip_new.c +++ b/ext/zip/lib/zip_new.c @@ -45,7 +45,7 @@ creates a new zipfile struct, and sets the contents to zero; returns the new struct. */ -struct zip * +PHPZIPAPI struct zip * _zip_new(struct zip_error *error) { struct zip *za; diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index e9d4667ab3..711dcb1cac 100644 --- a/ext/zip/lib/zip_open.c +++ b/ext/zip/lib/zip_open.c @@ -58,7 +58,7 @@ static struct zip_cdir *_zip_readcdir(FILE *, unsigned char *, unsigned char *, -struct zip * +PHPZIPAPI struct zip * zip_open(const char *fn, int flags, int *zep) { FILE *fp; diff --git a/ext/zip/lib/zip_rename.c b/ext/zip/lib/zip_rename.c index f35291893f..8141dc46a6 100644 --- a/ext/zip/lib/zip_rename.c +++ b/ext/zip/lib/zip_rename.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_rename(struct zip *za, int idx, const char *name) { if (idx >= za->nentry || idx < 0) { diff --git a/ext/zip/lib/zip_replace.c b/ext/zip/lib/zip_replace.c index ae78e62b80..12db005f28 100644 --- a/ext/zip/lib/zip_replace.c +++ b/ext/zip/lib/zip_replace.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_replace(struct zip *za, int idx, struct zip_source *source) { if (idx < 0 || idx >= za->nentry || source == NULL) { @@ -57,7 +57,7 @@ zip_replace(struct zip *za, int idx, struct zip_source *source) -int +PHPZIPAPI int _zip_replace(struct zip *za, int idx, const char *name, struct zip_source *source) { diff --git a/ext/zip/lib/zip_set_archive_comment.c b/ext/zip/lib/zip_set_archive_comment.c index b0929e56b6..7649a80de9 100644 --- a/ext/zip/lib/zip_set_archive_comment.c +++ b/ext/zip/lib/zip_set_archive_comment.c @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_set_archive_comment(struct zip *za, const char *comment, int len) { char *tmpcom; diff --git a/ext/zip/lib/zip_set_file_comment.c b/ext/zip/lib/zip_set_file_comment.c index cbf71db5c2..5454aa21da 100644 --- a/ext/zip/lib/zip_set_file_comment.c +++ b/ext/zip/lib/zip_set_file_comment.c @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_set_file_comment(struct zip *za, int idx, const char *comment, int len) { char *tmpcom; diff --git a/ext/zip/lib/zip_set_name.c b/ext/zip/lib/zip_set_name.c index 46dca56466..8a401faaca 100644 --- a/ext/zip/lib/zip_set_name.c +++ b/ext/zip/lib/zip_set_name.c @@ -42,7 +42,7 @@ -int +PHPZIPAPI int _zip_set_name(struct zip *za, int idx, const char *name) { char *s; diff --git a/ext/zip/lib/zip_source_buffer.c b/ext/zip/lib/zip_source_buffer.c index 6f8ac640e9..95875b74c1 100644 --- a/ext/zip/lib/zip_source_buffer.c +++ b/ext/zip/lib/zip_source_buffer.c @@ -52,7 +52,7 @@ static ssize_t read_data(void *state, void *data, size_t len, -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_buffer(struct zip *za, const void *data, off_t len, int freep) { struct read_data *f; diff --git a/ext/zip/lib/zip_source_file.c b/ext/zip/lib/zip_source_file.c index d635da3421..486e1900d9 100644 --- a/ext/zip/lib/zip_source_file.c +++ b/ext/zip/lib/zip_source_file.c @@ -43,7 +43,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_file(struct zip *za, const char *fname, off_t start, off_t len) { struct zip_source *zs; diff --git a/ext/zip/lib/zip_source_filep.c b/ext/zip/lib/zip_source_filep.c index 60b994e161..8a33042655 100644 --- a/ext/zip/lib/zip_source_filep.c +++ b/ext/zip/lib/zip_source_filep.c @@ -57,7 +57,7 @@ static ssize_t read_file(void *state, void *data, size_t len, -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_filep(struct zip *za, FILE *file, off_t start, off_t len) { struct read_file *f; diff --git a/ext/zip/lib/zip_source_free.c b/ext/zip/lib/zip_source_free.c index 33e36eaf43..707309c913 100644 --- a/ext/zip/lib/zip_source_free.c +++ b/ext/zip/lib/zip_source_free.c @@ -42,7 +42,7 @@ -void +PHPZIPAPI void zip_source_free(struct zip_source *source) { if (source == NULL) diff --git a/ext/zip/lib/zip_source_function.c b/ext/zip/lib/zip_source_function.c index 4f01a43c51..4ab1109244 100644 --- a/ext/zip/lib/zip_source_function.c +++ b/ext/zip/lib/zip_source_function.c @@ -42,7 +42,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_function(struct zip *za, zip_source_callback zcb, void *ud) { struct zip_source *zs; diff --git a/ext/zip/lib/zip_source_zip.c b/ext/zip/lib/zip_source_zip.c index a31fd2787e..75e6564021 100644 --- a/ext/zip/lib/zip_source_zip.c +++ b/ext/zip/lib/zip_source_zip.c @@ -52,7 +52,7 @@ static ssize_t read_zip(void *st, void *data, size_t len, -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_zip(struct zip *za, struct zip *srcza, int srcidx, int flags, off_t start, off_t len) { diff --git a/ext/zip/lib/zip_stat.c b/ext/zip/lib/zip_stat.c index bea153d157..7c6cbf00d2 100644 --- a/ext/zip/lib/zip_stat.c +++ b/ext/zip/lib/zip_stat.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_stat(struct zip *za, const char *fname, int flags, struct zip_stat *st) { int idx; diff --git a/ext/zip/lib/zip_stat_index.c b/ext/zip/lib/zip_stat_index.c index bab79a74ba..cf55565ef5 100644 --- a/ext/zip/lib/zip_stat_index.c +++ b/ext/zip/lib/zip_stat_index.c @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_stat_index(struct zip *za, int index, int flags, struct zip_stat *st) { const char *name; diff --git a/ext/zip/lib/zip_stat_init.c b/ext/zip/lib/zip_stat_init.c index 7ab0f4da75..e9c056dfc5 100644 --- a/ext/zip/lib/zip_stat_init.c +++ b/ext/zip/lib/zip_stat_init.c @@ -39,7 +39,7 @@ -void +PHPZIPAPI void zip_stat_init(struct zip_stat *st) { st->name = NULL; diff --git a/ext/zip/lib/zip_strerror.c b/ext/zip/lib/zip_strerror.c index 83e2985068..f3e5aa9fe8 100644 --- a/ext/zip/lib/zip_strerror.c +++ b/ext/zip/lib/zip_strerror.c @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_strerror(struct zip *za) { return _zip_error_strerror(&za->error); diff --git a/ext/zip/lib/zip_unchange.c b/ext/zip/lib/zip_unchange.c index 34e7f2d367..80070e7a3b 100644 --- a/ext/zip/lib/zip_unchange.c +++ b/ext/zip/lib/zip_unchange.c @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange(struct zip *za, int idx) { return _zip_unchange(za, idx, 0); @@ -49,7 +49,7 @@ zip_unchange(struct zip *za, int idx) -int +PHPZIPAPI int _zip_unchange(struct zip *za, int idx, int allow_duplicates) { int i; diff --git a/ext/zip/lib/zip_unchange_all.c b/ext/zip/lib/zip_unchange_all.c index f1e27da045..2d4459c823 100644 --- a/ext/zip/lib/zip_unchange_all.c +++ b/ext/zip/lib/zip_unchange_all.c @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange_all(struct zip *za) { int ret, i; diff --git a/ext/zip/lib/zip_unchange_archive.c b/ext/zip/lib/zip_unchange_archive.c index 7418aaf6ac..6c2bc6dcb3 100644 --- a/ext/zip/lib/zip_unchange_archive.c +++ b/ext/zip/lib/zip_unchange_archive.c @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange_archive(struct zip *za) { free(za->ch_comment); diff --git a/ext/zip/lib/zip_unchange_data.c b/ext/zip/lib/zip_unchange_data.c index 2526769261..dfa2ea545f 100644 --- a/ext/zip/lib/zip_unchange_data.c +++ b/ext/zip/lib/zip_unchange_data.c @@ -39,7 +39,7 @@ #include "zipint.h" -void +PHPZIPAPI void _zip_unchange_data(struct zip_entry *ze) { if (ze->source) { diff --git a/ext/zip/lib/zip_win32.h b/ext/zip/lib/zip_win32.h index a33347ba0c..ea3860d602 100644 --- a/ext/zip/lib/zip_win32.h +++ b/ext/zip/lib/zip_win32.h @@ -1,6 +1,3 @@ - -#ifdef _MSC_VER - #define _POSIX_ #include <windows.h> #include <io.h> @@ -12,9 +9,6 @@ #ifndef mode_t # define mode_t int #endif -#ifndef strcasecmp -# define strcasecmp stricmp -#endif #ifndef snprintf # define snprintf _snprintf #endif @@ -26,4 +20,3 @@ # define fseeko fseek #endif */ -#endif diff --git a/ext/zip/lib/zipint.h b/ext/zip/lib/zipint.h index ebf2743f99..33632aca4e 100644 --- a/ext/zip/lib/zipint.h +++ b/ext/zip/lib/zipint.h @@ -39,6 +39,10 @@ #include <zlib.h> #include "zip.h" +/* #defines that rename all zip_ functions and structs */ +#include "zipint_alias.h" + +BEGIN_EXTERN_C() #ifndef HAVE_FSEEKO #define fseeko(s, o, w) (fseek((s), (long int)(o), (w))) #endif @@ -185,42 +189,43 @@ extern const int _zip_err_type[]; -void _zip_cdir_free(struct zip_cdir *); -struct zip_cdir *_zip_cdir_new(int, struct zip_error *); -int _zip_cdir_write(struct zip_cdir *, FILE *, struct zip_error *); +PHPZIPAPI void _zip_cdir_free(struct zip_cdir *); +PHPZIPAPI struct zip_cdir *_zip_cdir_new(int, struct zip_error *); +PHPZIPAPI int _zip_cdir_write(struct zip_cdir *, FILE *, struct zip_error *); -void _zip_dirent_finalize(struct zip_dirent *); -void _zip_dirent_init(struct zip_dirent *); -int _zip_dirent_read(struct zip_dirent *, FILE *, +PHPZIPAPI void _zip_dirent_finalize(struct zip_dirent *); +PHPZIPAPI void _zip_dirent_init(struct zip_dirent *); +PHPZIPAPI int _zip_dirent_read(struct zip_dirent *, FILE *, unsigned char **, unsigned int, int, struct zip_error *); -int _zip_dirent_write(struct zip_dirent *, FILE *, int, struct zip_error *); - -void _zip_entry_free(struct zip_entry *); -void _zip_entry_init(struct zip *, int); -struct zip_entry *_zip_entry_new(struct zip *); - -void _zip_error_clear(struct zip_error *); -void _zip_error_copy(struct zip_error *, struct zip_error *); -void _zip_error_fini(struct zip_error *); -void _zip_error_get(struct zip_error *, int *, int *); -void _zip_error_init(struct zip_error *); -void _zip_error_set(struct zip_error *, int, int); -const char *_zip_error_strerror(struct zip_error *); - -int _zip_file_fillbuf(void *, size_t, struct zip_file *); -unsigned int _zip_file_get_offset(struct zip *, int); - -void _zip_free(struct zip *); -const char *_zip_get_name(struct zip *, int, int, struct zip_error *); -int _zip_local_header_read(struct zip *, int); -void *_zip_memdup(const void *, size_t, struct zip_error *); -int _zip_name_locate(struct zip *, const char *, int, struct zip_error *); -struct zip *_zip_new(struct zip_error *); -unsigned short _zip_read2(unsigned char **); -unsigned int _zip_read4(unsigned char **); -int _zip_replace(struct zip *, int, const char *, struct zip_source *); -int _zip_set_name(struct zip *, int, const char *); -int _zip_unchange(struct zip *, int, int); -void _zip_unchange_data(struct zip_entry *); - +PHPZIPAPI int _zip_dirent_write(struct zip_dirent *, FILE *, int, struct zip_error *); + +PHPZIPAPI void _zip_entry_free(struct zip_entry *); +PHPZIPAPI void _zip_entry_init(struct zip *, int); +PHPZIPAPI struct zip_entry *_zip_entry_new(struct zip *); + +PHPZIPAPI void _zip_error_clear(struct zip_error *); +PHPZIPAPI void _zip_error_copy(struct zip_error *, struct zip_error *); +PHPZIPAPI void _zip_error_fini(struct zip_error *); +PHPZIPAPI void _zip_error_get(struct zip_error *, int *, int *); +PHPZIPAPI void _zip_error_init(struct zip_error *); +PHPZIPAPI void _zip_error_set(struct zip_error *, int, int); +PHPZIPAPI const char *_zip_error_strerror(struct zip_error *); + +PHPZIPAPI int _zip_file_fillbuf(void *, size_t, struct zip_file *); +PHPZIPAPI unsigned int _zip_file_get_offset(struct zip *, int); + +PHPZIPAPI void _zip_free(struct zip *); +PHPZIPAPI const char *_zip_get_name(struct zip *, int, int, struct zip_error *); +PHPZIPAPI int _zip_local_header_read(struct zip *, int); +PHPZIPAPI void *_zip_memdup(const void *, size_t, struct zip_error *); +PHPZIPAPI int _zip_name_locate(struct zip *, const char *, int, struct zip_error *); +PHPZIPAPI struct zip *_zip_new(struct zip_error *); +PHPZIPAPI unsigned short _zip_read2(unsigned char **); +PHPZIPAPI unsigned int _zip_read4(unsigned char **); +PHPZIPAPI int _zip_replace(struct zip *, int, const char *, struct zip_source *); +PHPZIPAPI int _zip_set_name(struct zip *, int, const char *); +PHPZIPAPI int _zip_unchange(struct zip *, int, int); +PHPZIPAPI void _zip_unchange_data(struct zip_entry *); + +END_EXTERN_C(); #endif /* zipint.h */ diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 30c0220d7b..b0f5fa896e 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -31,16 +31,17 @@ #include "lib/zip.h" #include "lib/zipint.h" -static PHP_FUNCTION(zip_open); -static PHP_FUNCTION(zip_read); -static PHP_FUNCTION(zip_close); -static PHP_FUNCTION(zip_entry_read); -static PHP_FUNCTION(zip_entry_filesize); -static PHP_FUNCTION(zip_entry_name); -static PHP_FUNCTION(zip_entry_compressedsize); -static PHP_FUNCTION(zip_entry_compressionmethod); -static PHP_FUNCTION(zip_entry_open); -static PHP_FUNCTION(zip_entry_close); +/* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */ +static PHP_NAMED_FUNCTION(zif_zip_open); +static PHP_NAMED_FUNCTION(zif_zip_read); +static PHP_NAMED_FUNCTION(zif_zip_close); +static PHP_NAMED_FUNCTION(zif_zip_entry_read); +static PHP_NAMED_FUNCTION(zif_zip_entry_filesize); +static PHP_NAMED_FUNCTION(zif_zip_entry_name); +static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize); +static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod); +static PHP_NAMED_FUNCTION(zif_zip_entry_open); +static PHP_NAMED_FUNCTION(zif_zip_entry_close); /* {{{ Resource le */ static int le_zip_dir; @@ -273,9 +274,9 @@ static char * php_zipobj_get_zip_comment(struct zip *za, int *len TSRMLS_DC) /* /* {{{ zend_function_entry */ static zend_function_entry zip_functions[] = { - PHP_FE(zip_open, NULL) - PHP_FE(zip_close, NULL) - PHP_FE(zip_read, NULL) + ZEND_RAW_FENTRY("zip_open", zif_zip_open, NULL, 0) + ZEND_RAW_FENTRY("zip_close", zif_zip_close, NULL, 0) + ZEND_RAW_FENTRY("zip_read", zif_zip_read, NULL, 0) PHP_FE(zip_entry_open, NULL) PHP_FE(zip_entry_close, NULL) PHP_FE(zip_entry_read, NULL) @@ -634,6 +635,8 @@ static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* }}}*/ +/* reset macro */ +#undef zip /* {{{ function prototypes */ static PHP_MINIT_FUNCTION(zip); static PHP_MSHUTDOWN_FUNCTION(zip); @@ -659,10 +662,12 @@ zend_module_entry zip_module_entry = { #ifdef COMPILE_DL_ZIP ZEND_GET_MODULE(zip) #endif +/* set macro */ +#define zip php_ziplib__zip /* {{{ proto resource zip_open(string filename) Create new zip using source uri for output */ -static PHP_FUNCTION(zip_open) +static PHP_NAMED_FUNCTION(zif_zip_open) { char *filename; int filename_len; @@ -704,7 +709,7 @@ static PHP_FUNCTION(zip_open) /* {{{ proto void zip_close(resource zip) Close a Zip archive */ -static PHP_FUNCTION(zip_close) +static PHP_NAMED_FUNCTION(zif_zip_close) { zval * zip; zip_rsrc *z_rsrc = NULL; @@ -721,7 +726,7 @@ static PHP_FUNCTION(zip_close) /* {{{ proto resource zip_read(resource zip) Returns the next file in the archive */ -static PHP_FUNCTION(zip_read) +static PHP_NAMED_FUNCTION(zif_zip_read) { zval *zip_dp; zip_read_rsrc *zr_rsrc; @@ -765,7 +770,7 @@ static PHP_FUNCTION(zip_read) /* {{{ proto bool zip_entry_open(resource zip_dp, resource zip_entry [, string mode]) Open a Zip File, pointed by the resource entry */ /* Dummy function to follow the old API */ -static PHP_FUNCTION(zip_entry_open) +static PHP_NAMED_FUNCTION(zif_zip_entry_open) { zval * zip; zval * zip_entry; @@ -792,7 +797,7 @@ static PHP_FUNCTION(zip_entry_open) /* {{{ proto void zip_entry_close(resource zip_ent) Close a zip entry */ /* another dummy function to fit in the old api*/ -static PHP_FUNCTION(zip_entry_close) +static PHP_NAMED_FUNCTION(zif_zip_entry_close) { zval * zip_entry; zip_read_rsrc * zr_rsrc; @@ -809,7 +814,7 @@ static PHP_FUNCTION(zip_entry_close) /* {{{ proto mixed zip_entry_read(resource zip_entry [, int len]) Read from an open directory entry */ -static PHP_FUNCTION(zip_entry_read) +static PHP_NAMED_FUNCTION(zif_zip_entry_read) { zval * zip_entry; long len = 0; @@ -909,7 +914,7 @@ static void php_zip_entry_get_info(INTERNAL_FUNCTION_PARAMETERS, int opt) /* {{{ /* {{{ proto string zip_entry_name(resource zip_entry) Return the name given a ZZip entry */ -static PHP_FUNCTION(zip_entry_name) +static PHP_NAMED_FUNCTION(zif_zip_entry_name) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } @@ -917,7 +922,7 @@ static PHP_FUNCTION(zip_entry_name) /* {{{ proto int zip_entry_compressedsize(resource zip_entry) Return the compressed size of a ZZip entry */ -static PHP_FUNCTION(zip_entry_compressedsize) +static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } @@ -925,7 +930,7 @@ static PHP_FUNCTION(zip_entry_compressedsize) /* {{{ proto int zip_entry_filesize(resource zip_entry) Return the actual filesize of a ZZip entry */ -static PHP_FUNCTION(zip_entry_filesize) +static PHP_NAMED_FUNCTION(zif_zip_entry_filesize) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); } @@ -933,7 +938,7 @@ static PHP_FUNCTION(zip_entry_filesize) /* {{{ proto string zip_entry_compressionmethod(resource zip_entry) Return a string containing the compression method used on a particular entry */ -static PHP_FUNCTION(zip_entry_compressionmethod) +static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod) { php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3); } @@ -2004,7 +2009,9 @@ static zend_function_entry zip_class_functions[] = { /* }}} */ /* {{{ PHP_MINIT_FUNCTION */ +#undef zip static PHP_MINIT_FUNCTION(zip) +#define zip php_ziplib__zip { zend_class_entry ce; @@ -2085,7 +2092,9 @@ static PHP_MINIT_FUNCTION(zip) /* {{{ PHP_MSHUTDOWN_FUNCTION */ +#undef zip static PHP_MSHUTDOWN_FUNCTION(zip) +#define zip php_ziplib__zip { zend_hash_destroy(&zip_prop_handlers); php_unregister_url_stream_wrapper("zip" TSRMLS_CC); @@ -2096,6 +2105,7 @@ static PHP_MSHUTDOWN_FUNCTION(zip) /* {{{ PHP_MINFO_FUNCTION */ +#undef zip static PHP_MINFO_FUNCTION(zip) { php_info_print_table_start(); |