hyanantha Wed Sep 29 06:21:44 2004 EDT
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
removed unwanted comments, NEW_LIBC checks and NetWare specific stat structure
population
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.78&r2=1.79&ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.78
php-src/ext/standard/ftp_fopen_wrapper.c:1.79
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.78 Sun Aug 15 21:41:14 2004
+++ php-src/ext/standard/ftp_fopen_wrapper.c Wed Sep 29 06:21:41 2004
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.78 2004/08/16 01:41:14 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.79 2004/09/29 10:21:41 hyanantha Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -35,14 +35,6 @@
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
-#elif defined(NETWARE)
-/*#include <ws2nlm.h>*/
-/*#include <sys/socket.h>*/
-#ifdef NEW_LIBC
-#include <sys/param.h>
-#else
-#include "netware/param.h"
-#endif
#else
#include <sys/param.h>
#endif
@@ -57,7 +49,6 @@
#ifdef PHP_WIN32
#include <winsock2.h>
#elif defined(NETWARE) && defined(USE_WINSOCK)
-/*#include <ws2nlm.h>*/
#include <novsock2.h>
#else
#include <netinet/in.h>
@@ -828,19 +819,33 @@
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;
#ifdef HAVE_ST_BLKSIZE
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
