diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-11-30 16:38:37 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-11-30 16:38:37 +0000 |
| commit | ca89b6dedd5e2a790ba909e4eecdfd5fdce721b3 (patch) | |
| tree | 8e1a2e1c25d52a7a76e11d82980c6792ee206f03 /ext/zip/lib | |
| parent | c69555b94895d360cd66a42547764ab43b457d03 (diff) | |
| download | php-git-ca89b6dedd5e2a790ba909e4eecdfd5fdce721b3.tar.gz | |
last set of zts fixes
Diffstat (limited to 'ext/zip/lib')
| -rw-r--r-- | ext/zip/lib/zip_dirent.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c index f0c988bc70..0eeb4ac561 100644 --- a/ext/zip/lib/zip_dirent.c +++ b/ext/zip/lib/zip_dirent.c @@ -33,8 +33,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -47,6 +45,7 @@ #include "zip.h" #include "zipint.h" +#include "main/php_reentrancy.h" static time_t _zip_d2u_time(int, int); static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *); @@ -391,11 +390,11 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp, static time_t _zip_d2u_time(int dtime, int ddate) { - struct tm *tm; + struct tm *tm, tmbuf; time_t now; now = time(NULL); - tm = localtime(&now); + tm = php_localtime_r(&now, &tmbuf); tm->tm_year = ((ddate>>9)&127) + 1980 - 1900; tm->tm_mon = ((ddate>>5)&15) - 1; @@ -520,9 +519,9 @@ _zip_write4(unsigned int i, FILE *fp) static void _zip_u2d_time(time_t time, unsigned short *dtime, unsigned short *ddate) { - struct tm *tm; + struct tm *tm, tmbuf; - tm = localtime(&time); + tm = php_localtime_r(&time, &tmbuf); *ddate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday; *dtime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) |