diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /ext/phar/stream.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'ext/phar/stream.c')
| -rw-r--r-- | ext/phar/stream.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ext/phar/stream.c b/ext/phar/stream.c index 5706c20952..27554c1785 100644 --- a/ext/phar/stream.c +++ b/ext/phar/stream.c @@ -491,42 +491,24 @@ void phar_dostat(phar_archive_data *phar, phar_entry_info *data, php_stream_stat ssb->sb.st_mode = data->flags & PHAR_ENT_PERM_MASK; ssb->sb.st_mode |= S_IFREG; /* regular file */ /* timestamp is just the timestamp when this was added to the phar */ -#ifdef NETWARE - ssb->sb.st_mtime.tv_sec = data->timestamp; - ssb->sb.st_atime.tv_sec = data->timestamp; - ssb->sb.st_ctime.tv_sec = data->timestamp; -#else ssb->sb.st_mtime = data->timestamp; ssb->sb.st_atime = data->timestamp; ssb->sb.st_ctime = data->timestamp; -#endif } else if (!is_temp_dir && data->is_dir) { ssb->sb.st_size = 0; ssb->sb.st_mode = data->flags & PHAR_ENT_PERM_MASK; ssb->sb.st_mode |= S_IFDIR; /* regular directory */ /* timestamp is just the timestamp when this was added to the phar */ -#ifdef NETWARE - ssb->sb.st_mtime.tv_sec = data->timestamp; - ssb->sb.st_atime.tv_sec = data->timestamp; - ssb->sb.st_ctime.tv_sec = data->timestamp; -#else ssb->sb.st_mtime = data->timestamp; ssb->sb.st_atime = data->timestamp; ssb->sb.st_ctime = data->timestamp; -#endif } else { ssb->sb.st_size = 0; ssb->sb.st_mode = 0777; ssb->sb.st_mode |= S_IFDIR; /* regular directory */ -#ifdef NETWARE - ssb->sb.st_mtime.tv_sec = phar->max_timestamp; - ssb->sb.st_atime.tv_sec = phar->max_timestamp; - ssb->sb.st_ctime.tv_sec = phar->max_timestamp; -#else ssb->sb.st_mtime = phar->max_timestamp; ssb->sb.st_atime = phar->max_timestamp; ssb->sb.st_ctime = phar->max_timestamp; -#endif } if (!phar->is_writeable) { ssb->sb.st_mode = (ssb->sb.st_mode & 0555) | (ssb->sb.st_mode & ~0777); |