cvs: php4 /ext/standard info.c lcg.c link.c mail.c

hyanantha Fri Sep 6 03:27:28 2002 EDT Modified files: /php4/ext/standard info.c lcg.c link.c mail.c Log: NetWare related additions/modifications Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.198 php4/ext/standard/info.c:1.199 --- php4/ext/standard/info.c:1.198 Sat Aug 31 17:43:54 2002 +++ php4/ext/standard/info.c Fri Sep 6 03:27:26 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.198 2002/08/31 21:43:54 jan Exp $ */ +/* $Id: info.c,v 1.199 2002/09/06 07:27:26 hyanantha Exp $ */ #include "php.h" #include "php_ini.h" @@ -28,7 +28,7 @@ #include "SAPI.h" #include <time.h> #include "php_main.h" -#if !defined(PHP_WIN32) +#if !defined(PHP_WIN32) && !defined(NETWARE) #include "build-defs.h" #endif #include "zend_globals.h" /* needs ELS */ Index: php4/ext/standard/lcg.c diff -u php4/ext/standard/lcg.c:1.32 php4/ext/standard/lcg.c:1.33 --- php4/ext/standard/lcg.c:1.32 Thu Feb 28 03:26:46 2002 +++ php4/ext/standard/lcg.c Fri Sep 6 03:27:27 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: lcg.c,v 1.32 2002/02/28 08:26:46 sebastian Exp $ */ +/* $Id: lcg.c,v 1.33 2002/09/06 07:27:27 hyanantha Exp $ */ #include "php.h" #include "php_lcg.h" @@ -27,6 +27,12 @@ #ifdef PHP_WIN32 #include "win32/time.h" +#elif defined(NETWARE) +#ifdef NEW_LIBC +#include <sys/timeval.h> +#else +#include "netware/time_nw.h" +#endif #else #include <sys/time.h> #endif Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.38 php4/ext/standard/link.c:1.39 --- php4/ext/standard/link.c:1.38 Sun Jun 16 17:24:15 2002 +++ php4/ext/standard/link.c Fri Sep 6 03:27:27 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.38 2002/06/16 21:24:15 sesser Exp $ */ +/* $Id: link.c,v 1.39 2002/09/06 07:27:27 hyanantha Exp $ */ #include "php.h" #include "php_filestat.h" @@ -33,6 +33,8 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include "win32/pwd.h" +#elif defined(NETWARE) +#include "netware/pwd.h" #else #include <pwd.h> #endif @@ -79,7 +81,11 @@ PHP_FUNCTION(linkinfo) { zval **filename; +#if defined(NETWARE) && defined(CLIB_STAT_PATCH) + struct stat_libc sb; +#else struct stat sb; +#endif int ret; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.61 php4/ext/standard/mail.c:1.62 --- php4/ext/standard/mail.c:1.61 Mon Aug 26 05:47:46 2002 +++ php4/ext/standard/mail.c Fri Sep 6 03:27:27 2002 @@ -16,14 +16,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.61 2002/08/26 09:47:46 derick Exp $ */ +/* $Id: mail.c,v 1.62 2002/09/06 07:27:27 hyanantha Exp $ */ #include <stdlib.h> #include <ctype.h> #include <stdio.h> #include "php.h" #include "ext/standard/info.h" -#if !defined(PHP_WIN32) +#if !defined(PHP_WIN32) && !defined(NETWARE) #include "build-defs.h" #if HAVE_SYSEXITS_H #include <sysexits.h> @@ -42,6 +42,11 @@ #include "win32/sendmail.h" #endif +#ifdef NETWARE +#include "netware/pipe.h" /* For popen(), pclose() */ +#include "netware/sysexits.h" /* For exit status codes like EX_OK */ +#endif + /* {{{ proto int ezmlm_hash(string addr) Calculate EZMLM list hash value. */ PHP_FUNCTION(ezmlm_hash) @@ -137,7 +142,8 @@ */ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd TSRMLS_DC) { -#ifdef PHP_WIN32 +/*#ifdef PHP_WIN32*/ +#if (defined PHP_WIN32 || defined NETWARE) int tsm_err; char *tsm_errmsg = NULL; #endif @@ -147,7 +153,8 @@ char *sendmail_cmd = NULL; if (!sendmail_path) { -#ifdef PHP_WIN32 +/*#ifdef PHP_WIN32*/ +#if (defined PHP_WIN32 || defined NETWARE) /* handle old style win smtp sending */ if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, headers, subject, to, message, NULL, NULL, NULL) == FAILURE) { if (tsm_errmsg) {