mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 05:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed now obsolete NetWare hack since I fixed this

Browse Source 
with Novell some longer time ago in their SDK header.
This commit is contained in:
Guenter Knauf 2009-11-03 21:21:34 +00:00
parent 4a95aa3989
commit 824692fab8
7 changed files with 3 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/exif/exif.c
View File

@ -3876,11 +3876,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
}
/* Store file date/time. */
#ifdef NETWARE
ImageInfo->FileDateTime = st.st_mtime.tv_sec;
#else
ImageInfo->FileDateTime = st.st_mtime;
#endif
ImageInfo->FileSize = st.st_size;
/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Opened stream is file: %d", ImageInfo->FileSize);*/
}

4
ext/session/mod_files.c
View File

@ -244,11 +244,7 @@ static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC)
/* check whether its last access was more than maxlifet ago */
if (VCWD_STAT(buf, &sbuf) == 0 &&
#ifdef NETWARE
(now - sbuf.st_mtime.tv_sec) > maxlifetime) {
#else
(now - sbuf.st_mtime) > maxlifetime) {
#endif
VCWD_UNLINK(buf);
nrdels++;
}

8
ext/session/session.c
View File

@ -61,12 +61,6 @@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps);
* Helpers *
*********** */
#ifdef NETWARE
# define SESS_SB_MTIME(sb) ((sb).st_mtime.tv_sec)
#else
# define SESS_SB_MTIME(sb) ((sb).st_mtime)
#endif
#define IF_SESSION_VARS() \
if (PS(http_session_vars) && PS(http_session_vars)->type == IS_ARRAY)
@ -1095,7 +1089,7 @@ static inline void last_modified(TSRMLS_D) /* {{{ */
#define LAST_MODIFIED "Last-Modified: "
memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &SESS_SB_MTIME(sb));
strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
ADD_HEADER(buf);
}
}

17
ext/standard/file.c
View File

@ -50,16 +50,6 @@
# include "win32/param.h"
# include "win32/winutil.h"
# include "win32/fnmatch.h"
#elif defined(NETWARE)
# include <sys/param.h>
# include <sys/select.h>
# ifdef USE_WINSOCK
# include <novsock2.h>
# else
# include <sys/socket.h>
# include <netinet/in.h>
# include <netdb.h>
# endif
#else
# if HAVE_SYS_PARAM_H
# include <sys/param.h>
@ -1636,16 +1626,9 @@ PHP_NAMED_FUNCTION(php_if_fstat)
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size);
#ifdef NETWARE
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime.tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime.tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime.tv_sec);
#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_ssb.sb.st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_ssb.sb.st_mtime);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_ssb.sb.st_ctime);
#endif
#ifdef HAVE_ST_BLKSIZE
MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_ssb.sb.st_blksize);
#else

22
ext/standard/filestat.c
View File

@ -386,7 +386,7 @@ PHP_FUNCTION(disk_free_space)
}
/* }}} */
#if !defined(WINDOWS)
#if !defined(WINDOWS) && !defined(NETWARE)
static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
{
char *filename;
@ -487,7 +487,7 @@ PHP_FUNCTION(lchgrp)
/* }}} */
#endif /* !NETWARE */
#if !defined(WINDOWS)
#if !defined(WINDOWS) && !defined(NETWARE)
static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
{
char *filename;
@ -899,23 +899,11 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
case FS_GROUP:
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
#ifdef NETWARE
RETURN_LONG((long)ssb.sb.st_atime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_atime);
#endif
case FS_MTIME:
#ifdef NETWARE
RETURN_LONG((long)ssb.sb.st_mtime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_mtime);
#endif
case FS_CTIME:
#ifdef NETWARE
RETURN_LONG((long)ssb.sb.st_ctime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_ctime);
#endif
case FS_TYPE:
if (S_ISLNK(ssb.sb.st_mode)) {
RETURN_STRING("link", 1);
@ -963,15 +951,9 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1);
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb->st_size);
#ifdef NETWARE
MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_sec);
MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_sec);
#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_sb->st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_sb->st_mtime);
MAKE_LONG_ZVAL_INCREF(stat_ctime, stat_sb->st_ctime);
#endif
#ifdef HAVE_ST_BLKSIZE
MAKE_LONG_ZVAL_INCREF(stat_blksize, stat_sb->st_blksize);
#else

13
ext/standard/ftp_fopen_wrapper.c
View File

@ -834,32 +834,19 @@ static int php_stream_ftp_url_stat(php_stream_wrapper *wrapper, char *url, int f
tm.tm_sec += stamp - mktime(gmt);
tm.tm_isdst = gmt->tm_isdst;
#ifdef NETWARE
ssb->sb.st_mtime.tv_sec = mktime(&tm);
#else
ssb->sb.st_mtime = mktime(&tm);
#endif
} else {
/* error or unsupported command */
mdtm_error:
#ifdef NETWARE
ssb->sb.st_mtime.tv_sec = -1;
#else
ssb->sb.st_mtime = -1;
#endif
}
ssb->sb.st_ino = 0; /* Unknown values */
ssb->sb.st_dev = 0;
ssb->sb.st_uid = 0;
ssb->sb.st_gid = 0;
#ifdef NETWARE
ssb->sb.st_atime.tv_sec = -1;
ssb->sb.st_ctime.tv_sec = -1;
#else
ssb->sb.st_atime = -1;
ssb->sb.st_ctime = -1;
#endif
ssb->sb.st_nlink = 1;
ssb->sb.st_rdev = -1;

4
ext/standard/pageinfo.c
View File

@ -68,11 +68,7 @@ PHPAPI void php_statpage(TSRMLS_D)
BG(page_uid) = pstat->st_uid;
BG(page_gid) = pstat->st_gid;
BG(page_inode) = pstat->st_ino;
#ifdef NETWARE
BG(page_mtime) = (pstat->st_mtime).tv_sec;
#else
BG(page_mtime) = pstat->st_mtime;
#endif
} else { /* handler for situations where there is no source file, ex. php -r */
BG(page_uid) = getuid();
BG(page_gid) = getgid();