diff options
Diffstat (limited to 'ext/phar/func_interceptors.c')
| -rw-r--r-- | ext/phar/func_interceptors.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index a390a1fa5c..05bcbf9c36 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -446,7 +446,6 @@ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value) "size", "atime", "mtime", "ctime", "blksize", "blocks" }; -#ifndef NETWARE if (type >= FS_IS_W && type <= FS_IS_X) { if(stat_sb->st_uid==getuid()) { rmask=S_IRUSR; @@ -476,7 +475,6 @@ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value) } } } -#endif switch (type) { case FS_PERMS: @@ -490,23 +488,11 @@ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value) case FS_GROUP: RETURN_LONG((zend_long)stat_sb->st_gid); case FS_ATIME: -#ifdef NETWARE - RETURN_LONG((zend_long)stat_sb->st_atime.tv_sec); -#else RETURN_LONG((zend_long)stat_sb->st_atime); -#endif case FS_MTIME: -#ifdef NETWARE - RETURN_LONG((zend_long)stat_sb->st_mtime.tv_sec); -#else RETURN_LONG((zend_long)stat_sb->st_mtime); -#endif case FS_CTIME: -#ifdef NETWARE - RETURN_LONG((zend_long)stat_sb->st_ctime.tv_sec); -#else RETURN_LONG((zend_long)stat_sb->st_ctime); -#endif case FS_TYPE: if (S_ISLNK(stat_sb->st_mode)) { RETURN_STRING("link"); @@ -548,15 +534,9 @@ static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value) ZVAL_LONG(&stat_rdev, -1); #endif ZVAL_LONG(&stat_size, stat_sb->st_size); -#ifdef NETWARE - ZVAL_LONG(&stat_atime, (stat_sb->st_atime).tv_sec); - ZVAL_LONG(&stat_mtime, (stat_sb->st_mtime).tv_sec); - ZVAL_LONG(&stat_ctime, (stat_sb->st_ctime).tv_sec); -#else ZVAL_LONG(&stat_atime, stat_sb->st_atime); ZVAL_LONG(&stat_mtime, stat_sb->st_mtime); ZVAL_LONG(&stat_ctime, stat_sb->st_ctime); -#endif #ifdef HAVE_ST_BLKSIZE ZVAL_LONG(&stat_blksize, stat_sb->st_blksize); #else @@ -669,15 +649,9 @@ splitted: sb.st_size = 0; sb.st_mode = 0777; sb.st_mode |= S_IFDIR; /* regular directory */ -#ifdef NETWARE - sb.st_mtime.tv_sec = phar->max_timestamp; - sb.st_atime.tv_sec = phar->max_timestamp; - sb.st_ctime.tv_sec = phar->max_timestamp; -#else sb.st_mtime = phar->max_timestamp; sb.st_atime = phar->max_timestamp; sb.st_ctime = phar->max_timestamp; -#endif goto statme_baby; } else { char *save; @@ -715,15 +689,9 @@ notfound: sb.st_size = 0; sb.st_mode = 0777; sb.st_mode |= S_IFDIR; /* regular directory */ -#ifdef NETWARE - sb.st_mtime.tv_sec = phar->max_timestamp; - sb.st_atime.tv_sec = phar->max_timestamp; - sb.st_ctime.tv_sec = phar->max_timestamp; -#else sb.st_mtime = phar->max_timestamp; sb.st_atime = phar->max_timestamp; sb.st_ctime = phar->max_timestamp; -#endif goto statme_baby; } PHAR_G(cwd) = save; @@ -747,15 +715,9 @@ stat_entry: sb.st_mode |= S_IFREG; /* regular file */ } /* timestamp is just the timestamp when this was added to the phar */ -#ifdef NETWARE - sb.st_mtime.tv_sec = data->timestamp; - sb.st_atime.tv_sec = data->timestamp; - sb.st_ctime.tv_sec = data->timestamp; -#else sb.st_mtime = data->timestamp; sb.st_atime = data->timestamp; sb.st_ctime = data->timestamp; -#endif } else { sb.st_size = 0; sb.st_mode = data->flags & PHAR_ENT_PERM_MASK; @@ -764,15 +726,9 @@ stat_entry: sb.st_mode |= S_IFLNK; } /* timestamp is just the timestamp when this was added to the phar */ -#ifdef NETWARE - sb.st_mtime.tv_sec = data->timestamp; - sb.st_atime.tv_sec = data->timestamp; - sb.st_ctime.tv_sec = data->timestamp; -#else sb.st_mtime = data->timestamp; sb.st_atime = data->timestamp; sb.st_ctime = data->timestamp; -#endif } statme_baby: |