from:"Anantha Kesari H Y"

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mbstring config.m4

2005-10-28 Thread Anantha Kesari H Y

hyanantha   Fri Oct 28 02:28:50 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mbstring   config.m4 
  Log:
  NetWare LibC SDK has stdarg.h
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.51.2.4r2=1.51.2.5ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.51.2.4 
php-src/ext/mbstring/config.m4:1.51.2.5
--- php-src/ext/mbstring/config.m4:1.51.2.4 Wed Oct 26 09:51:58 2005
+++ php-src/ext/mbstring/config.m4  Fri Oct 28 02:28:44 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.51.2.4 2005/10/26 13:51:58 tony2001 Exp $
+dnl $Id: config.m4,v 1.51.2.5 2005/10/28 06:28:44 hyanantha Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -66,7 +66,19 @@
return 0;
 }
 int main() { return foo(10, , 3.14); }
-  ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], 
[cv_php_mbstring_stdarg=no])
+  ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], 
+ [
+  dnl cross-compile needs something here
+case $host_alias in
+*netware*)
+cv_php_mbstring_stdarg=yes
+;;
+*)
+cv_php_mbstring_stdarg=no
+;;
+esac
+]
+)
 ])
 
 AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h 
sys/times.h])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring config.m4

2005-10-28 Thread Anantha Kesari H Y

hyanantha   Fri Oct 28 03:53:04 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/mbstring   config.m4 
  Log:
  NetWare LibC sdk has stdarg.h
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.58.2.1r2=1.58.2.2ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.1 
php-src/ext/mbstring/config.m4:1.58.2.2
--- php-src/ext/mbstring/config.m4:1.58.2.1 Wed Oct 26 09:50:39 2005
+++ php-src/ext/mbstring/config.m4  Fri Oct 28 03:52:58 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.1 2005/10/26 13:50:39 tony2001 Exp $
+dnl $Id: config.m4,v 1.58.2.2 2005/10/28 07:52:58 hyanantha Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -72,7 +72,19 @@
return 0;
 }
 int main() { return foo(10, , 3.14); }
-  ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], 
[cv_php_mbstring_stdarg=no])
+  ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], 
+ [
+  dnl cross-compile needs something here
+case $host_alias in
+*netware*)
+cv_php_mbstring_stdarg=yes
+;;
+*)
+cv_php_mbstring_stdarg=no
+;;
+esac
+]
+)
 ])
 
 AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h 
sys/times.h])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) / acinclude.m4

2005-09-23 Thread Anantha Kesari H Y

hyanantha   Fri Sep 23 04:27:54 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcacinclude.m4 
  Log:
  In NetWare two binaries with the same name can not be loaded in kernel 
address space(This is the default behaviour for NetWare apache webserver and 
hence PHP extensions also get loaded in kernel address space) simultaneoulsy. 
As the current autoconf built mysql extension is built as mysql.nlm this 
forbids the loading of mysql client binary. To work around this NetWare 
idiosyncrasy prefixing all the extensions with php except php5lib(phpts.dll 
eqivalent of Windows). I could have named this extensions prefixed with php_ 
but _ is eaten by the exported symbol prefix by the GCC cross compiler for 
NetWare so sticking to php.
  This fixes the issue of not needing PHP_SUBST(EXTENSIONNAME_SHARED_LIBADD) 
in all the extensions especially when they need to be built shared.
  
  --Kamesh
  
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.22r2=1.271.2.23ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.22 php-src/acinclude.m4:1.271.2.23
--- php-src/acinclude.m4:1.271.2.22 Mon Jul 25 18:31:07 2005
+++ php-src/acinclude.m4Fri Sep 23 04:27:52 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.22 2005/07/25 22:31:07 helly Exp $ -*- 
autoconf -*-
+dnl $Id: acinclude.m4,v 1.271.2.23 2005/09/23 08:27:52 hyanantha Exp $ -*- 
autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1197,7 +1197,7 @@
   ;;
 *netware*[)]
   suffix=nlm
-  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware 
-lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 
3)),a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
 *[)]
   suffix=la
@@ -1289,10 +1289,12 @@
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
   *netware*)
-PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+   PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6)
+   ;;
+  *)
+   PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   ;;
   esac
-  PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
 fi
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) / acinclude.m4

2005-09-23 Thread Anantha Kesari H Y

hyanantha   Fri Sep 23 05:20:25 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-srcacinclude.m4 
  Log:
  In NetWare two binaries with the same name can not be loaded in kernel 
address space(This is the default behaviour for NetWare apache webserver and 
hence PHP extensions also get loaded in kernel address space) simultaneoulsy. 
As the current autoconf built mysql extension is built as mysql.nlm this 
forbids the loading of mysql client binary. To work around this NetWare 
idiosyncrasy prefixing all the extensions with php except php5lib(phpts.dll 
eqivalent of Windows). I could have named this extensions prefixed with php_ 
but _ is eaten from the exported symbol prefix by the GCC cross compiler for 
NetWare so sticking to php.
  This fixes the issue of not needing PHP_SUBST(EXTENSIONNAME_SHARED_LIBADD) 
in all the extensions especially when they need to be built shared.
  
  --Kamesh 
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.50.2.4r2=1.218.2.50.2.5ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.50.2.4 php-src/acinclude.m4:1.218.2.50.2.5
--- php-src/acinclude.m4:1.218.2.50.2.4 Wed Jul 27 07:58:28 2005
+++ php-src/acinclude.m4Fri Sep 23 05:20:22 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.50.2.4 2005/07/27 11:58:28 hyanantha Exp $ -*- 
autoconf -*-
+dnl $Id: acinclude.m4,v 1.218.2.50.2.5 2005/09/23 09:20:22 hyanantha Exp $ -*- 
autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1197,7 +1197,7 @@
   ;;
 *netware*[)]
   suffix=nlm
-  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) ifelse($1, php4lib, , -L$(top_builddir)/netware 
-lphp4lib) $(translit(ifelse($1, php4lib, $1, m4_substr($1, 
3)),a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
 *[)]
   suffix=la
@@ -1289,10 +1289,12 @@
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
   *netware*)
-PHP_ADD_LIBRARY_WITH_PATH(php4lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+   PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6)
+   ;;
+  *)
+   PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   ;;
   esac
-  PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
 fi
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_1) / acinclude.m4

2005-09-23 Thread Anantha Kesari H Y

hyanantha   Fri Sep 23 05:25:19 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcacinclude.m4 
  Log:
  In NetWare two binaries with the same name can not be loaded in kernel 
address space(This is the default behaviour for NetWare apache webserver and 
hence PHP extensions also get loaded in kernel address space) simultaneoulsy. 
As the current autoconf built mysql extension is built as mysql.nlm this 
forbids the loading of mysql client binary. To work around this NetWare 
idiosyncrasy prefixing all the extensions with php except php5lib(phpts.dll 
eqivalent of Windows). I could have named this extensions prefixed with php_ 
but _ is eaten from the exported symbol prefix by the GCC cross compiler for 
NetWare so sticking to php.
  This fixes the issue of not needing PHP_SUBST(EXTENSIONNAME_SHARED_LIBADD) 
in all the extensions especially when they need to be built shared.
  
  --Kamesh 
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.332.2.3r2=1.332.2.4ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.3 php-src/acinclude.m4:1.332.2.4
--- php-src/acinclude.m4:1.332.2.3  Thu Sep  1 04:25:52 2005
+++ php-src/acinclude.m4Fri Sep 23 05:25:18 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.3 2005/09/01 08:25:52 sniper Exp $
+dnl $Id: acinclude.m4,v 1.332.2.4 2005/09/23 09:25:18 hyanantha Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -856,7 +856,7 @@
   ;;
 *netware*[)]
   suffix=nlm
-  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware 
-lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 
3)),a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
 *[)]
   suffix=la
@@ -952,10 +952,12 @@
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
   *netware*)
-PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+   PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6)
+   ;;
+  *)
+   PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   ;;
   esac
-  PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
 fi
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/sockets config.m4 sockets.c

2005-09-23 Thread Anantha Kesari H Y

hyanantha   Fri Sep 23 05:54:34 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/socketsconfig.m4 sockets.c 
  Log:
  NetWare LibC don't have socketpair function. So enabling socket_create_pair 
functionality only if socketpair is available in the host LibC.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/config.m4?r1=1.15r2=1.15.4.1ty=u
Index: php-src/ext/sockets/config.m4
diff -u php-src/ext/sockets/config.m4:1.15 
php-src/ext/sockets/config.m4:1.15.4.1
--- php-src/ext/sockets/config.m4:1.15  Mon Jul  7 23:38:00 2003
+++ php-src/ext/sockets/config.m4   Fri Sep 23 05:54:31 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15 2003/07/08 03:38:00 pollita Exp $
+dnl $Id: config.m4,v 1.15.4.1 2005/09/23 09:54:31 hyanantha Exp $
 dnl
 
 PHP_ARG_ENABLE(sockets, whether to enable sockets support,
@@ -31,5 +31,6 @@
   PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
 fi
 
+PHP_CHECK_FUNC(socketpair)
 PHP_CHECK_FUNC(gethostbyname2)
 
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171r2=1.171.2.1ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171 
php-src/ext/sockets/sockets.c:1.171.2.1
--- php-src/ext/sockets/sockets.c:1.171 Wed Aug  3 10:07:52 2005
+++ php-src/ext/sockets/sockets.c   Fri Sep 23 05:54:31 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171 2005/08/03 14:07:52 sniper Exp $ */
+/* $Id: sockets.c,v 1.171.2.1 2005/09/23 09:54:31 hyanantha Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -116,7 +116,9 @@
PHP_FE(socket_select,   
first_through_third_args_force_ref)
PHP_FE(socket_create,   NULL)
PHP_FE(socket_create_listen,NULL)
+#ifdef HAVE_SOCKETPAIR
PHP_FE(socket_create_pair,  fourth_arg_force_ref)
+#endif
PHP_FE(socket_accept,   NULL)
PHP_FE(socket_set_nonblock, NULL)
PHP_FE(socket_set_block,NULL)
@@ -1652,6 +1654,7 @@
 }
 /* }}} */
 
+#ifdef HAVE_SOCKETPAIR
 /* {{{ proto bool socket_create_pair(int domain, int type, int protocol, array 
fd)
Creates a pair of indistinguishable sockets and stores them in fds. */
 PHP_FUNCTION(socket_create_pair)
@@ -1711,6 +1714,7 @@
RETURN_TRUE;
 }
 /* }}} */
+#endif
 
 /* {{{ proto bool socket_shutdown(resource socket[, int how])
Shuts down a socket for receiving, sending, or both. */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/sockets config.m4 sockets.c

2005-09-23 Thread Anantha Kesari H Y

hyanantha   Fri Sep 23 06:01:07 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/socketssockets.c config.m4 
  Log:
  NetWare LibC don't have socketpair function. So enabling socket_create_pair 
functionality only if socketpair is available in the host LibC.
  --Kamesh
  
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.165.2.4r2=1.165.2.5ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.165.2.4 
php-src/ext/sockets/sockets.c:1.165.2.5
--- php-src/ext/sockets/sockets.c:1.165.2.4 Thu May 12 12:27:05 2005
+++ php-src/ext/sockets/sockets.c   Fri Sep 23 06:01:06 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.165.2.4 2005/05/12 16:27:05 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.165.2.5 2005/09/23 10:01:06 hyanantha Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -116,7 +116,9 @@
PHP_FE(socket_select,   
first_through_third_args_force_ref)
PHP_FE(socket_create,   NULL)
PHP_FE(socket_create_listen,NULL)
+#ifdef HAVE_SOCKETPAIR
PHP_FE(socket_create_pair,  fourth_arg_force_ref)
+#endif
PHP_FE(socket_accept,   NULL)
PHP_FE(socket_set_nonblock, NULL)
PHP_FE(socket_set_block,NULL)
@@ -1652,6 +1654,7 @@
 }
 /* }}} */
 
+#ifdef HAVE_SOCKETPAIR
 /* {{{ proto bool socket_create_pair(int domain, int type, int protocol, array 
fd)
Creates a pair of indistinguishable sockets and stores them in fds. */
 PHP_FUNCTION(socket_create_pair)
@@ -1711,6 +1714,7 @@
RETURN_TRUE;
 }
 /* }}} */
+#endif
 
 /* {{{ proto bool socket_shutdown(resource socket[, int how])
Shuts down a socket for receiving, sending, or both. */
http://cvs.php.net/diff.php/php-src/ext/sockets/config.m4?r1=1.15r2=1.15.2.1ty=u
Index: php-src/ext/sockets/config.m4
diff -u php-src/ext/sockets/config.m4:1.15 
php-src/ext/sockets/config.m4:1.15.2.1
--- php-src/ext/sockets/config.m4:1.15  Mon Jul  7 23:38:00 2003
+++ php-src/ext/sockets/config.m4   Fri Sep 23 06:01:06 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15 2003/07/08 03:38:00 pollita Exp $
+dnl $Id: config.m4,v 1.15.2.1 2005/09/23 10:01:06 hyanantha Exp $
 dnl
 
 PHP_ARG_ENABLE(sockets, whether to enable sockets support,
@@ -31,5 +31,6 @@
   PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
 fi
 
+PHP_CHECK_FUNC(socketpair)
 PHP_CHECK_FUNC(gethostbyname2)
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c

2005-09-15 Thread Anantha Kesari H Y

hyanantha   Thu Sep 15 10:06:18 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/main   main.c 
  Log:
  NetWare does not have sendmail binary to send mail.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.3r2=1.512.2.63.2.4ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.3 php-src/main/main.c:1.512.2.63.2.4
--- php-src/main/main.c:1.512.2.63.2.3  Wed Aug 17 11:34:24 2005
+++ php-src/main/main.c Thu Sep 15 10:06:15 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.512.2.63.2.3 2005/08/17 15:34:24 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.4 2005/09/15 14:06:15 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -257,7 +257,7 @@
 #  define PHP_SAFE_MODE_EXEC_DIR 
 #endif
 
-#ifdef PHP_PROG_SENDMAIL
+#if defined(PHP_PROG_SENDMAIL)  !defined(NETWARE) 
 #  define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL  -t -i 
 #else
 #  define DEFAULT_SENDMAIL_PATH NULL

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/cli php_getopt.h

2005-09-01 Thread Anantha Kesari H Y

hyanantha   Thu Sep  1 05:51:50 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/cli   php_getopt.h 
  Log:
  As NetWare LibC has optind and optarg macros defined in unistd.h our local 
variables were getting mistakenly preprocessed so undeffing optind and optarg
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php_getopt.h?r1=1.1.8.3r2=1.1.8.3.6.1ty=u
Index: php-src/sapi/cli/php_getopt.h
diff -u php-src/sapi/cli/php_getopt.h:1.1.8.3 
php-src/sapi/cli/php_getopt.h:1.1.8.3.6.1
--- php-src/sapi/cli/php_getopt.h:1.1.8.3   Fri May 30 22:20:08 2003
+++ php-src/sapi/cli/php_getopt.h   Thu Sep  1 05:51:46 2005
@@ -16,10 +16,17 @@
+--+
 */
 
-/* $Id: php_getopt.h,v 1.1.8.3 2003/05/31 02:20:08 helly Exp $ */
+/* $Id: php_getopt.h,v 1.1.8.3.6.1 2005/09/01 09:51:46 hyanantha Exp $ */
 
 #include php.h
 
+#ifdef NETWARE
+/*
+As NetWare LibC has optind and optarg macros defined in unistd.h our local 
variables were getting mistakenly preprocessed so undeffing optind and optarg
+*/
+#undef optarg
+#undef optind
+#endif
 /* Define structure for one recognized option (both single char and long name).
  * If short_open is '-' this is the last option.
  */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/exif exif.c

2005-08-05 Thread Anantha Kesari H Y

hyanantha   Fri Aug  5 10:00:49 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/exif   exif.c 
  Log:
  NetWare specific stat structure issues.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.8r2=1.162.2.9ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162.2.8 php-src/ext/exif/exif.c:1.162.2.9
--- php-src/ext/exif/exif.c:1.162.2.8   Thu Mar 17 12:20:35 2005
+++ php-src/ext/exif/exif.c Fri Aug  5 10:00:47 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.162.2.8 2005/03/17 17:20:35 iliaa Exp $ */
+/* $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 hyanantha Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.8 2005/03/17 17:20:35 iliaa 
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 
hyanantha Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3744,7 +3744,11 @@
if (php_stream_is(ImageInfo-infile, PHP_STREAM_IS_STDIO)) {
if (VCWD_STAT(FileName, st) = 0) {
/* 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);*/
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/exif exif.c

2005-08-05 Thread Anantha Kesari H Y

hyanantha   Fri Aug  5 10:03:58 2005 EDT

  Modified files:  
/php-src/ext/exif   exif.c 
  Log:
  NetWare specific stat structure issues.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.172r2=1.173ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.172 php-src/ext/exif/exif.c:1.173
--- php-src/ext/exif/exif.c:1.172   Wed Aug  3 10:07:07 2005
+++ php-src/ext/exif/exif.c Fri Aug  5 10:03:57 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.172 2005/08/03 14:07:07 sniper Exp $ */
+/* $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha Exp $ */
 
 /*  ToDos
  *
@@ -115,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.172 2005/08/03 14:07:07 sniper Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173 2005/08/05 14:03:57 hyanantha 
Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3744,7 +3744,11 @@
if (php_stream_is(ImageInfo-infile, PHP_STREAM_IS_STDIO)) {
if (VCWD_STAT(FileName, st) = 0) {
/* 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);*/
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/exif exif.c

2005-08-05 Thread Anantha Kesari H Y

hyanantha   Fri Aug  5 10:09:21 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/exif   exif.c 
  Log:
  NetWare specific stat structure issues.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.37r2=1.118.2.37.2.1ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.37 
php-src/ext/exif/exif.c:1.118.2.37.2.1
--- php-src/ext/exif/exif.c:1.118.2.37  Tue Mar 22 17:07:03 2005
+++ php-src/ext/exif/exif.c Fri Aug  5 10:09:18 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.118.2.37 2005/03/22 22:07:03 edink Exp $ */
+/* $Id: exif.c,v 1.118.2.37.2.1 2005/08/05 14:09:18 hyanantha Exp $ */
 
 /*  ToDos
  *
@@ -107,7 +107,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.37 2005/03/22 22:07:03 edink 
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.37.2.1 2005/08/05 14:09:18 
hyanantha Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3722,7 +3722,11 @@
if (php_stream_is(ImageInfo-infile, PHP_STREAM_IS_STDIO)) {
if (VCWD_STAT(FileName, st) = 0) {
/* 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 TSRMLS_CC, ImageInfo, 
E_NOTICE, open stream is file: %d, ImageInfo-FileSize);*/
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache2filter sapi_apache2.c

2005-08-03 Thread Anantha Kesari H Y

hyanantha   Wed Aug  3 10:49:53 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/apache2filter sapi_apache2.c 
  Log:
  NetWare specific stat structure issues.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.91.2.27r2=1.91.2.27.2.1ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.27 
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.27.2.1
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.27 Fri Apr  8 16:35:02 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c   Wed Aug  3 10:49:50 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.91.2.27 2005/04/08 20:35:02 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.27.2.1 2005/08/03 14:49:50 hyanantha Exp $ */
 
 #include fcntl.h
 
@@ -168,9 +168,15 @@
ctx-finfo.st_gid = ctx-r-finfo.group;
ctx-finfo.st_dev = ctx-r-finfo.device;
ctx-finfo.st_ino = ctx-r-finfo.inode;
+#ifdef NETWARE
+   ctx-finfo.st_atime.tv_sec = ctx-r-finfo.atime/100;
+   ctx-finfo.st_mtime.tv_sec = ctx-r-finfo.mtime/100;
+   ctx-finfo.st_ctime.tv_sec = ctx-r-finfo.ctime/100;
+#else
ctx-finfo.st_atime = ctx-r-finfo.atime/100;
ctx-finfo.st_mtime = ctx-r-finfo.mtime/100;
ctx-finfo.st_ctime = ctx-r-finfo.ctime/100;
+#endif
ctx-finfo.st_size = ctx-r-finfo.size;
ctx-finfo.st_nlink = ctx-r-finfo.nlink;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard mail.c

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 04:48:34 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   mail.c 
  Log:
  defined EX_OK and EX_TEMPFAIL in ext/standard/mail.c for NETWARE rather than 
including a sysexits.h
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/mail.c?r1=1.82.2.2r2=1.82.2.3ty=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.82.2.2 
php-src/ext/standard/mail.c:1.82.2.3
--- php-src/ext/standard/mail.c:1.82.2.2Wed Jun 29 05:22:20 2005
+++ php-src/ext/standard/mail.c Thu Jul 28 04:48:31 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mail.c,v 1.82.2.2 2005/06/29 09:22:20 hyanantha Exp $ */
+/* $Id: mail.c,v 1.82.2.3 2005/07/28 08:48:31 hyanantha Exp $ */
 
 #include stdlib.h
 #include ctype.h
@@ -42,7 +42,8 @@
 #endif
 
 #ifdef NETWARE
-#include netware/sysexits.h   /* For exit status codes like EX_OK */
+#define EX_OK   0   /* successful termination */
+#define EX_TEMPFAIL 75  /* temp failure; user is invited to retry */
 #endif
 
 #define SKIP_LONG_HEADER_SEP(str, pos) 
\

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /win32 sendmail.c sendmail.h

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 04:57:38 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/win32  sendmail.c sendmail.h 
  Log:
  Cleaned up the NetWare specific code
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.59.2.3r2=1.59.2.4ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.59.2.3 php-src/win32/sendmail.c:1.59.2.4
--- php-src/win32/sendmail.c:1.59.2.3   Fri Mar 11 05:48:06 2005
+++ php-src/win32/sendmail.cThu Jul 28 04:57:37 2005
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.59.2.3 2005/03/11 10:48:06 hyanantha Exp $ */
+/* $Id: sendmail.c,v 1.59.2.4 2005/07/28 08:57:37 hyanantha Exp $ */
 
 #include php.h   /*php specific */
 #include stdio.h
@@ -83,13 +83,11 @@
 #ifndef NETWARE
 WSADATA Data;
 struct hostent *adr;
-#endif /* NETWARE */
-SOCKADDR_IN sock_in;
-#ifndef NETWARE
 int WinsockStarted;
 /* values set by the constructor */
 char *AppName;
 #endif /* NETWARE */
+SOCKADDR_IN sock_in;
 char MailHost[HOST_NAME_LEN];
 char LocalHost[HOST_NAME_LEN];
 #endif
@@ -346,14 +344,7 @@
*/
 
shutdown(sc, 0); 
-#ifndef NETWARE
closesocket(sc);
-#else
-   /* closesocket commented out since it was giving undefined symbol 
linker error
-* close added in its place
-*/
-   close(sc);
-#endif /* NETWARE */
 }
 
 
@@ -841,11 +832,7 @@
 // Author/Date:  jcar 20/9/96
 // History:
 ///
-#ifndef NETWARE
 int Post(LPCSTR msg)
-#else
-int Post(char *msg)
-#endif
 {
int len = strlen(msg);
int slen;
@@ -932,11 +919,7 @@
 // Author/Date:  jcar 20/9/96
 // History:
 ///
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost)
-#else
-unsigned long GetAddr(char * szHost)
-#endif
 {
LPHOSTENT lpstHost;
u_long lAddr = INADDR_ANY;
@@ -952,11 +935,7 @@
 
lpstHost = gethostbyname(szHost);
if (lpstHost) { /* success */
-#ifndef NETWARE
lAddr = *((u_long FAR *) (lpstHost-h_addr));
-#else
-   lAddr = *((u_long *) (lpstHost-h_addr));
-#endif /* NETWARE */
} else {
lAddr = INADDR_ANY; /* failure */
}
http://cvs.php.net/diff.php/php-src/win32/sendmail.h?r1=1.13r2=1.13.2.1ty=u
Index: php-src/win32/sendmail.h
diff -u php-src/win32/sendmail.h:1.13 php-src/win32/sendmail.h:1.13.2.1
--- php-src/win32/sendmail.h:1.13   Mon Dec  8 17:10:42 2003
+++ php-src/win32/sendmail.hThu Jul 28 04:57:38 2005
@@ -44,18 +44,7 @@
 
 int MailConnect();
 int PostHeader(char *, char *, char *, char *);
-#ifndef NETWARE
 int Post(LPCSTR msg);
-#else
-int Post(char *msg);
-#endif
 int Ack(char **server_response);
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost);
-#else
-unsigned long GetAddr(char * szHost);
-#endif
-
-
-
 #endif /* sendmail_h */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /netware/sys stat.h

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 05:01:46 2005 EDT

  Removed files:   (Branch: PHP_4_4)
/php-src/netware/sysstat.h 
  Log:
  NetWare LibC SDK has stat.h. So removing this.
  --Kamesh
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32 sendmail.h

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 05:43:28 2005 EDT

  Modified files:  
/php-src/win32  sendmail.h 
  Log:
  NetWare cleanup
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.h?r1=1.13r2=1.14ty=u
Index: php-src/win32/sendmail.h
diff -u php-src/win32/sendmail.h:1.13 php-src/win32/sendmail.h:1.14
--- php-src/win32/sendmail.h:1.13   Mon Dec  8 17:10:42 2003
+++ php-src/win32/sendmail.hThu Jul 28 05:43:28 2005
@@ -44,18 +44,7 @@
 
 int MailConnect();
 int PostHeader(char *, char *, char *, char *);
-#ifndef NETWARE
 int Post(LPCSTR msg);
-#else
-int Post(char *msg);
-#endif
 int Ack(char **server_response);
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost);
-#else
-unsigned long GetAddr(char * szHost);
-#endif
-
-
-
 #endif /* sendmail_h */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32 sendmail.c

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 05:44:13 2005 EDT

  Modified files:  
/php-src/win32  sendmail.c 
  Log:
  NetWare cleanup
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.63r2=1.64ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.63 php-src/win32/sendmail.c:1.64
--- php-src/win32/sendmail.c:1.63   Sat Mar 12 07:03:50 2005
+++ php-src/win32/sendmail.cThu Jul 28 05:44:13 2005
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.63 2005/03/12 12:03:50 andrey Exp $ */
+/* $Id: sendmail.c,v 1.64 2005/07/28 09:44:13 hyanantha Exp $ */
 
 #include php.h   /*php specific */
 #include stdio.h
@@ -83,13 +83,11 @@
 #ifndef NETWARE
 WSADATA Data;
 struct hostent *adr;
-#endif /* NETWARE */
-SOCKADDR_IN sock_in;
-#ifndef NETWARE
 int WinsockStarted;
 /* values set by the constructor */
 char *AppName;
 #endif /* NETWARE */
+SOCKADDR_IN sock_in;
 char MailHost[HOST_NAME_LEN];
 char LocalHost[HOST_NAME_LEN];
 #endif
@@ -348,14 +346,7 @@
*/
 
shutdown(sc, 0); 
-#ifndef NETWARE
closesocket(sc);
-#else
-   /* closesocket commented out since it was giving undefined symbol 
linker error
-* close added in its place
-*/
-   close(sc);
-#endif /* NETWARE */
 }
 
 
@@ -843,11 +834,7 @@
 // Author/Date:  jcar 20/9/96
 // History:
 ///
-#ifndef NETWARE
 int Post(LPCSTR msg)
-#else
-int Post(char *msg)
-#endif
 {
int len = strlen(msg);
int slen;
@@ -934,11 +921,7 @@
 // Author/Date:  jcar 20/9/96
 // History:
 ///
-#ifndef NETWARE
 unsigned long GetAddr(LPSTR szHost)
-#else
-unsigned long GetAddr(char * szHost)
-#endif
 {
LPHOSTENT lpstHost;
u_long lAddr = INADDR_ANY;
@@ -954,11 +937,7 @@
 
lpstHost = gethostbyname(szHost);
if (lpstHost) { /* success */
-#ifndef NETWARE
lAddr = *((u_long FAR *) (lpstHost-h_addr));
-#else
-   lAddr = *((u_long *) (lpstHost-h_addr));
-#endif /* NETWARE */
} else {
lAddr = INADDR_ANY; /* failure */
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /win32 sendmail.c

2005-07-28 Thread Anantha Kesari H Y

hyanantha   Thu Jul 28 06:10:19 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/win32  sendmail.c 
  Log:
  NetWare changes from 5.0 Tree.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.47.2.10r2=1.47.2.10.2.1ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.47.2.10 
php-src/win32/sendmail.c:1.47.2.10.2.1
--- php-src/win32/sendmail.c:1.47.2.10  Wed Jan 19 13:54:57 2005
+++ php-src/win32/sendmail.cThu Jul 28 06:10:16 2005
@@ -17,11 +17,12 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.47.2.10 2005/01/19 18:54:57 iliaa Exp $ */
+/* $Id: sendmail.c,v 1.47.2.10.2.1 2005/07/28 10:10:16 hyanantha Exp $ */
 
 #include php.h   /*php specific */
 #include stdio.h
 #include stdlib.h
+#ifndef NETWARE
 #include winsock.h
 #include time.h
 #include string.h
@@ -29,6 +30,9 @@
 #include malloc.h
 #include memory.h
 #include winbase.h
+#else
+#include netware/sendmail_nw.h
+#endif
 #include sendmail.h
 #include php_ini.h
 
@@ -74,17 +78,24 @@
 
 /* socket related data */
 SOCKET sc;
+#ifndef NETWARE
 WSADATA Data;
 struct hostent *adr;
-SOCKADDR_IN sock_in;
 int WinsockStarted;
 /* values set by the constructor */
 char *AppName;
+#endif  /* NETWARE */
+SOCKADDR_IN sock_in;
 char MailHost[HOST_NAME_LEN];
 char LocalHost[HOST_NAME_LEN];
 #endif
 char seps[] =  ,\t\n;
+#ifndef NETWARE
 char *php_mailer = PHP 4 WIN32;
+#else
+char *php_mailer = PHP 4 NetWare;
+#endif  /* NETWARE */
+
 
 char *get_header(char *h, char *headers);
 
@@ -214,7 +225,10 @@
char *pos1 = NULL, *pos2 = NULL;
TSRMLS_FETCH();
 
+#ifndef NETWARE
WinsockStarted = FALSE;
+#endif
+
 
if (host == NULL) {
*error = BAD_MAIL_HOST;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main php_streams.h

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 05:14:44 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/main   php_streams.h 
  Log:
  Removing redundant CLIB_STAT_PATCH checks.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.61.2.18r2=1.61.2.18.2.1ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.61.2.18 
php-src/main/php_streams.h:1.61.2.18.2.1
--- php-src/main/php_streams.h:1.61.2.18Mon May 16 04:55:31 2005
+++ php-src/main/php_streams.h  Wed Jul 27 05:14:44 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_streams.h,v 1.61.2.18 2005/05/16 08:55:31 tony2001 Exp $ */
+/* $Id: php_streams.h,v 1.61.2.18.2.1 2005/07/27 09:14:44 hyanantha Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -106,11 +106,7 @@
void * ptr TSRMLS_DC);
 
 typedef struct _php_stream_statbuf {
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc sb; /* regular info */
-#else
struct stat sb; /* regular info */
-#endif
/* extended info to go here some day: content-type etc. etc. */
 } php_stream_statbuf;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/bcmath/libbcmath/src config.h /ext/mcve mcve.c /ext/pcre/pcrelib internal.h

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 06:32:16 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mcve   mcve.c 
/php-src/ext/bcmath/libbcmath/src   config.h 
/php-src/ext/pcre/pcrelib   internal.h 
  Log:
  NetWare can make use of autoconf based build
  
  
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.14.2.11r2=1.14.2.11.2.1ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.14.2.11 php-src/ext/mcve/mcve.c:1.14.2.11.2.1
--- php-src/ext/mcve/mcve.c:1.14.2.11   Sun Jan  9 16:05:31 2005
+++ php-src/ext/mcve/mcve.c Wed Jul 27 06:32:15 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: mcve.c,v 1.14.2.11 2005/01/09 21:05:31 sniper Exp $ */
+/* $Id: mcve.c,v 1.14.2.11.2.1 2005/07/27 10:32:15 hyanantha Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,8 +27,6 @@
 
 #if PHP_WIN32
 #include config.w32.h
-#elif defined NETWARE
-#include config.nw.h
 #else
 #include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/src/config.h?r1=1.3.2.1r2=1.3.2.1.2.1ty=u
Index: php-src/ext/bcmath/libbcmath/src/config.h
diff -u php-src/ext/bcmath/libbcmath/src/config.h:1.3.2.1 
php-src/ext/bcmath/libbcmath/src/config.h:1.3.2.1.2.1
--- php-src/ext/bcmath/libbcmath/src/config.h:1.3.2.1   Sun Jan  9 16:05:31 2005
+++ php-src/ext/bcmath/libbcmath/src/config.h   Wed Jul 27 06:32:16 2005
@@ -1,7 +1,5 @@
 #if PHP_WIN32
 #include ../../../../main/config.w32.h
-#elif defined(NETWARE)
-#include config.nw.h
 #else
 #include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/pcre/pcrelib/internal.h?r1=1.12.2.5r2=1.12.2.5.2.1ty=u
Index: php-src/ext/pcre/pcrelib/internal.h
diff -u php-src/ext/pcre/pcrelib/internal.h:1.12.2.5 
php-src/ext/pcre/pcrelib/internal.h:1.12.2.5.2.1
--- php-src/ext/pcre/pcrelib/internal.h:1.12.2.5Fri May 27 14:12:42 2005
+++ php-src/ext/pcre/pcrelib/internal.h Wed Jul 27 06:32:16 2005
@@ -47,8 +47,6 @@
 
 #ifdef PHP_WIN32
 # include config.w32.h
-#elif defined(NETWARE)
-# include config.nw.h
 #else
 # include php_config.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard datetime.c filestat.c head.c image.c math.c pageinfo.c

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 07:22:39 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   datetime.c head.c image.c pageinfo.c math.c 
filestat.c 
  Log:
  ext/standard/datetime.c
  Removed redundant NEW_LIBC checks
  
  ext/standard/head.c
  Removed redundant inclusion of headers
  
  ext/standard/image.c
  Removed redundant inclusion of headers
  
  ext/standard/pageinfo.c
  Removed redundant CLIB_STAT_CHECK.  BG(page_mtime) was giving nano seconds 
portion out of timespec corrected to seconds.
  
  ext/standard/math.c
  Not to hardcode inability as much as possible, in future NetWare LibC SDK 
might have asinh that time autoconf can make this function available.
  
  ext/standard/filestat.c
  Fixed the typo of accessing the nano seconds from a timer_spec to seconds.
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.19r2=1.96.2.19.2.1ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.19 
php-src/ext/standard/datetime.c:1.96.2.19.2.1
--- php-src/ext/standard/datetime.c:1.96.2.19   Thu Apr 14 09:30:27 2005
+++ php-src/ext/standard/datetime.c Wed Jul 27 07:22:36 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: datetime.c,v 1.96.2.19 2005/04/14 13:30:27 iliaa Exp $ */
+/* $Id: datetime.c,v 1.96.2.19.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
 
 #include php.h
 #include zend_operators.h
@@ -52,7 +52,7 @@
 };
 
 #if !defined(HAVE_TM_ZONE)  !defined(_TIMEZONE)  
!defined(HAVE_DECLARED_TIMEZONE)
-#if defined(NETWARE)  defined(NEW_LIBC)
+#ifdef NETWARE
 #define timezone_timezone   /* timezone is called '_timezone' in new 
version of LibC */
 #endif
 extern time_t timezone;
http://cvs.php.net/diff.php/php-src/ext/standard/head.c?r1=1.66.2.4r2=1.66.2.4.2.1ty=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.66.2.4 
php-src/ext/standard/head.c:1.66.2.4.2.1
--- php-src/ext/standard/head.c:1.66.2.4Fri Jan  7 16:14:23 2005
+++ php-src/ext/standard/head.c Wed Jul 27 07:22:36 2005
@@ -15,14 +15,9 @@
| Author: Rasmus Lerdorf [EMAIL PROTECTED]|
+--+
  */
-/* $Id: head.c,v 1.66.2.4 2005/01/07 21:14:23 tony2001 Exp $ */
+/* $Id: head.c,v 1.66.2.4.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
 
 #include stdio.h
-
-#if defined(NETWARE)  !defined(NEW_LIBC)
-#include sys/socket.h
-#endif
-
 #include php.h
 #include ext/standard/php_standard.h
 #include SAPI.h
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.19r2=1.72.2.19.2.1ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.19 
php-src/ext/standard/image.c:1.72.2.19.2.1
--- php-src/ext/standard/image.c:1.72.2.19  Wed Jun  1 18:29:20 2005
+++ php-src/ext/standard/image.cWed Jul 27 07:22:36 2005
@@ -17,13 +17,10 @@
+--+
  */
 
-/* $Id: image.c,v 1.72.2.19 2005/06/01 22:29:20 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.19.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
 
 #include php.h
 #include stdio.h
-#if defined(NETWARE)  !defined(NEW_LIBC)
-#include sys/socket.h
-#endif
 #if HAVE_FCNTL_H
 #include fcntl.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/pageinfo.c?r1=1.34.2.1.8.1r2=1.34.2.1.8.2ty=u
Index: php-src/ext/standard/pageinfo.c
diff -u php-src/ext/standard/pageinfo.c:1.34.2.1.8.1 
php-src/ext/standard/pageinfo.c:1.34.2.1.8.2
--- php-src/ext/standard/pageinfo.c:1.34.2.1.8.1Tue Jul 26 05:32:58 2005
+++ php-src/ext/standard/pageinfo.c Wed Jul 27 07:22:36 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: pageinfo.c,v 1.34.2.1.8.1 2005/07/26 09:32:58 hyanantha Exp $ */
+/* $Id: pageinfo.c,v 1.34.2.1.8.2 2005/07/27 11:22:36 hyanantha Exp $ */
 
 #include php.h
 #include pageinfo.h
@@ -59,11 +59,7 @@
  */
 PHPAPI void php_statpage(TSRMLS_D)
 {
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc *pstat;
-#else
struct stat *pstat;
-#endif
 
pstat = sapi_get_stat(TSRMLS_C);
 
@@ -73,7 +69,7 @@
BG(page_gid)   = pstat-st_gid;
BG(page_inode) = pstat-st_ino;
 #ifdef NETWARE
-   BG(page_mtime) = (pstat-st_mtime).tv_nsec;
+   BG(page_mtime) = (pstat-st_mtime).tv_sec;
 #else
BG(page_mtime) = pstat-st_mtime;
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/math.c?r1=1.97.2.13r2=1.97.2.13.2.1ty=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.97.2.13 
php-src/ext/standard/math.c:1.97.2.13.2.1
--- php-src/ext/standard/math.c:1.97.2.13   Mon Dec 13 19:40:01 2004
+++ php-src/ext/standard/math.c Wed Jul 27 07:22:36 2005
@@ -19,7 +19,7 @@

[PHP-CVS] cvs: php-src(PHP_4_4) / acinclude.m4

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 07:58:29 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-srcacinclude.m4 
  Log:
  NetWare cross compile patches from 5.0
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.50.2.3r2=1.218.2.50.2.4ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.50.2.3 php-src/acinclude.m4:1.218.2.50.2.4
--- php-src/acinclude.m4:1.218.2.50.2.3 Mon Jul 18 14:39:12 2005
+++ php-src/acinclude.m4Wed Jul 27 07:58:28 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.50.2.3 2005/07/18 18:39:12 sniper Exp $ -*- 
autoconf -*-
+dnl $Id: acinclude.m4,v 1.218.2.50.2.4 2005/07/27 11:58:28 hyanantha Exp $ -*- 
autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1195,6 +1195,10 @@
   suffix=so
   link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle 
-undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
-o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
+*netware*[)]
+  suffix=nlm
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  ;;
 *[)]
   suffix=la
   link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
@@ -1283,6 +1287,11 @@
 if test $3 = shared || test $3 = yes; then
 dnl -- Shared module
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
+  case $host_alias in
+  *netware*)
+PHP_ADD_LIBRARY_WITH_PATH(php4lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+  ;;
+  esac
   PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
 fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / configure.in

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 07:48:15 2005 EDT

  Modified files:  
/php-srcconfigure.in 
  Log:
  configure.in
  moved the PHP_OS and PHP_UNAME definitions near the place other oses define 
them currently it is ggeting redined to build machine values when ./configure 
script is generated using autoconf version 2.13 but works fine with autoconf 
2.51. 
  Defining the default EXTENSION_DIR for NetWare
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.575r2=1.576ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.575 php-src/configure.in:1.576
--- php-src/configure.in:1.575  Thu Jul 14 10:00:57 2005
+++ php-src/configure.inWed Jul 27 07:48:14 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.575 2005/07/14 14:00:57 andi Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.576 2005/07/27 11:48:14 hyanantha Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -178,14 +178,11 @@
 fi
 ;;
 *netware*)
-PHP_OS=NetWare
-PHP_UNAME=NetWare
-AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[hardcode for each of the cross 
compiler host])
-AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[hardcode for each of the cross 
compiler host])
 PHP_BUILD_PROGRAM
 PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
 PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
 PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
+EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext
 PHP_SUBST(PHP5LIB_SHARED_LIBADD)
 PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware)
 ;;
@@ -1047,11 +1044,20 @@
 
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
 AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,$PHP_BUILD_DATE,[PHP build date])
-PHP_UNAME=`uname -a | xargs`
-AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[uname -a output])
-PHP_OS=`uname | xargs`
-AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[uname output])
-
+case $host_alias in
+*netware*)
+PHP_OS=NetWare
+PHP_UNAME=NetWare
+AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[hardcode for each of the cross 
compiler host])
+AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[hardcode for each of the cross 
compiler host])
+;;
+*)
+PHP_UNAME=`uname -a | xargs`
+AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[uname -a output])
+PHP_OS=`uname | xargs`
+AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[uname output])
+;;
+esac
 if test $PHP_SAPI_CLI != no; then
   PHP_CLI_TARGET=\$(SAPI_CLI_PATH)
   PHP_INSTALL_CLI_TARGET=install-cli

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main network.c

2005-07-27 Thread Anantha Kesari H Y

hyanantha   Wed Jul 27 08:43:07 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   network.c 
  Log:
  removing redundant inclusion of headers for NETWARE
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.109.2.4r2=1.109.2.5ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.109.2.4 php-src/main/network.c:1.109.2.5
--- php-src/main/network.c:1.109.2.4Mon Jun 20 19:16:54 2005
+++ php-src/main/network.c  Wed Jul 27 08:43:06 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.109.2.4 2005/06/20 23:16:54 tony2001 Exp $ */
+/* $Id: network.c,v 1.109.2.5 2005/07/27 12:43:06 hyanantha Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -28,9 +28,6 @@
 #ifdef PHP_WIN32
 #define O_RDONLY _O_RDONLY
 #include win32/param.h
-#elif defined(NETWARE)
-#include sys/timeval.h
-#include sys/param.h
 #else
 #include sys/param.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/bcmath/libbcmath/src config.h /ext/mcve mcve.c /ext/pcre/pcrelib internal.h /main php_sprintf.c

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 04:38:26 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/bcmath/libbcmath/src   config.h 
/php-src/ext/pcre/pcrelib   internal.h 
/php-src/ext/mcve   mcve.c 
/php-src/main   php_sprintf.c 
  Log:
  ext/pcre/pcrelib/internal.h
  NetWare can make use autoconf based build.
  
  main/php_sprintf.c
  NetWare can make use autoconf based build.
  
  ext/bcmath/libbcmath/src/config.h
  NetWare can make use autoconf based build.
  
  ext/mcve/mcve.c
  NetWare can make use autoconf based build.
  
  -- Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/src/config.h?r1=1.7.2.1r2=1.7.2.2ty=u
Index: php-src/ext/bcmath/libbcmath/src/config.h
diff -u php-src/ext/bcmath/libbcmath/src/config.h:1.7.2.1 
php-src/ext/bcmath/libbcmath/src/config.h:1.7.2.2
--- php-src/ext/bcmath/libbcmath/src/config.h:1.7.2.1   Sun Jan  9 16:05:16 2005
+++ php-src/ext/bcmath/libbcmath/src/config.h   Tue Jul 26 04:38:24 2005
@@ -1,7 +1,5 @@
 #if PHP_WIN32
 #include ../../../../main/config.w32.h
-#elif defined(NETWARE)
-#include config.nw.h
 #else
 #include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/pcre/pcrelib/internal.h?r1=1.15.2.2r2=1.15.2.3ty=u
Index: php-src/ext/pcre/pcrelib/internal.h
diff -u php-src/ext/pcre/pcrelib/internal.h:1.15.2.2 
php-src/ext/pcre/pcrelib/internal.h:1.15.2.3
--- php-src/ext/pcre/pcrelib/internal.h:1.15.2.2Fri May 27 14:07:32 2005
+++ php-src/ext/pcre/pcrelib/internal.h Tue Jul 26 04:38:25 2005
@@ -47,8 +47,6 @@
 
 #ifdef PHP_WIN32
 # include config.w32.h
-#elif defined(NETWARE)
-# include config.nw.h
 #else
 # include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.28.2.4r2=1.28.2.5ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.28.2.4 php-src/ext/mcve/mcve.c:1.28.2.5
--- php-src/ext/mcve/mcve.c:1.28.2.4Mon Jul 18 16:11:09 2005
+++ php-src/ext/mcve/mcve.c Tue Jul 26 04:38:25 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: mcve.c,v 1.28.2.4 2005/07/18 20:11:09 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.28.2.5 2005/07/26 08:38:25 hyanantha Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,8 +27,6 @@
 
 #if PHP_WIN32
 #include config.w32.h
-#elif defined NETWARE
-#include config.nw.h
 #else
 #include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/main/php_sprintf.c?r1=1.17.2.4r2=1.17.2.5ty=u
Index: php-src/main/php_sprintf.c
diff -u php-src/main/php_sprintf.c:1.17.2.4 php-src/main/php_sprintf.c:1.17.2.5
--- php-src/main/php_sprintf.c:1.17.2.4 Sun Jan  9 16:05:17 2005
+++ php-src/main/php_sprintf.c  Tue Jul 26 04:38:25 2005
@@ -16,15 +16,13 @@
+--+
  */
 
-/* $Id: php_sprintf.c,v 1.17.2.4 2005/01/09 21:05:17 sniper Exp $ */
+/* $Id: php_sprintf.c,v 1.17.2.5 2005/07/26 08:38:25 hyanantha Exp $ */
 
 #include stdio.h
 #include stdarg.h
 #include php.h
 #ifdef PHP_WIN32
 #include config.w32.h
-#elif defined NETWARE
-#include config.nw.h
 #else
 #include php_config.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main config.nw.h

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 04:42:49 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/main   config.nw.h 
  Log:
  removed main/config.nw.h
  -- Kamesh
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard basic_functions.c file.c filestat.c fsock.c ftp_fopen_wrapper.c http_fopen_wrapper.c mail.c pack.c pageinfo.c rand.c

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 05:33:00 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   basic_functions.c file.c filestat.c fsock.c 
mail.c pack.c pageinfo.c rand.c 
ftp_fopen_wrapper.c http_fopen_wrapper.c 
  Log:
  ext/standard/basic_functions.c
  Removed Redundant inclusion headers for NetWare. NetWare LibC SDK has netdb.h.
  
  ext/standard/file.c
  NetWare LibC sys/types.h does not include sys/select.h implicitly as it is 
the case with Linux LibC. So including explicitly.
  NetWare LibC SDK has pwd.h
  NetWare specific stat structure issues.
  
  ext/standard/filestat.c
  NetWare LibC SDK has pwd.h
  removing redundant CLIB_STAT_PATCH and NEW_LIBC checks
  
  ext/standard/fsock.c
  Removed the redundant NEW_LIBC checks
  
  ext/standard/mail.c
  netware/pipe.h not needed to be included anymore for NetWare
  Removed the netware/sysexits.h and defined the 2 relevant macros inside the 
NetWare section
  
  ext/standard/pack.c
  NetWare LibC SDK has pwd.h
  
  ext/standard/pageinfo.c
  NetWare LibC SDK has pwd.h.
  Removing redunant NEW_LIBC checks.
  
  ext/standard/rand.c
  NetWare LibC SDK has pwd.h.
  
  ext/standard/ftp_fopen_wrapper.c
  Removing redundant inclusion of headers. NetWare LibC SDK has sys/param.h
  
  ext/standard/http_fopen_wrapper.c
  Removing redundant inclusion of headers. NetWare LibC SDK has sys/param.h
  
  --Kamesh
  
  http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.51r2=1.543.2.51.2.1ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.51 
php-src/ext/standard/basic_functions.c:1.543.2.51.2.1
--- php-src/ext/standard/basic_functions.c:1.543.2.51   Mon May 16 04:55:31 2005
+++ php-src/ext/standard/basic_functions.c  Tue Jul 26 05:32:57 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.543.2.51 2005/05/16 08:55:31 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.51.2.1 2005/07/26 09:32:57 hyanantha Exp $ 
*/
 
 #include php.h
 #include php_streams.h
@@ -42,18 +42,7 @@
 #include time.h
 #include stdio.h
 
-#ifndef NETWARE
 #include netdb.h
-#else
-/*#include netware/env.h*//* Temporary */
-#ifdef NEW_LIBC /* Same headers hold good for Winsock and Berkeley sockets */
-#include netinet/in.h
-/*#include arpa/inet.h*/
-#include netdb.h
-#else
-#include sys/socket.h
-#endif
-#endif
 
 #if HAVE_ARPA_INET_H
 # include arpa/inet.h
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.70.2.1r2=1.279.2.70.2.2ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.70.2.1 
php-src/ext/standard/file.c:1.279.2.70.2.2
--- php-src/ext/standard/file.c:1.279.2.70.2.1  Wed Jul 20 15:26:31 2005
+++ php-src/ext/standard/file.c Tue Jul 26 05:32:57 2005
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.279.2.70.2.1 2005/07/20 19:26:31 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.70.2.2 2005/07/26 09:32:57 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -49,12 +49,11 @@
 #define O_RDONLY _O_RDONLY
 #include win32/param.h
 #include win32/winutil.h
-#elif defined(NETWARE)  !defined(NEW_LIBC)
-/*#include ws2nlm.h*/
-#include sys/socket.h
-#include netware/param.h
 #else
 #include sys/param.h
+#if HAVE_SYS_SELECT_H
+#include sys/select.h
+#endif
 #if defined(NETWARE)  defined(USE_WINSOCK)
 #include novsock2.h
 #else
@@ -73,8 +72,6 @@
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include win32/pwd.h
-#elif defined(NETWARE)
-#include netware/pwd.h
 #else
 #include pwd.h
 #endif
@@ -2061,9 +2058,15 @@
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
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.112.2.11r2=1.112.2.11.2.1ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.112.2.11 
php-src/ext/standard/filestat.c:1.112.2.11.2.1
--- php-src/ext/standard/filestat.c:1.112.2.11  Thu Sep  2 05:38:56 2004
+++ php-src/ext/standard/filestat.c Tue Jul 26 05:32:58 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.112.2.11 2004/09/02 09:38:56 stas Exp $ */
+/*

[PHP-CVS] cvs: php-src /main config.nw.h

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 09:12:03 2005 EDT

  Removed files:   
/php-src/main   config.nw.h 
  Log:
  NetWare can make use of autoconf based build
  --Kamesh
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main fopen_wrappers.c main.c network.c php_scandir.c user_streams.c

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 09:51:37 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/main   main.c fopen_wrappers.c user_streams.c php_scandir.c 
network.c 
  Log:
  main/main.c
  Removing redundant NEW_LIBC checks
  
  main/fopen_wrappers.c
  NetWare LibC SDK has sys/pwd.h and sys/param.h
  Removed redundant NEW_LIBC checks
  
  main/user_streams.c
  NetWare specific stat structure issues.
  
  main/php_scandir.c
  Netware LibC SDK does not have search.h
  
  main/network.c
  Removed redundant NEW_LIBC checks.
  NetWare LibC SDK has sys/param.h
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.1r2=1.512.2.63.2.2ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.1 php-src/main/main.c:1.512.2.63.2.2
--- php-src/main/main.c:1.512.2.63.2.1  Mon Jun 20 15:59:43 2005
+++ php-src/main/main.c Tue Jul 26 09:51:31 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.512.2.63.2.1 2005/06/20 19:59:43 tony2001 Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.2 2005/07/26 13:51:31 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -29,14 +29,6 @@
 #include win32/signal.h
 #include process.h
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
-#include sys/timeval.h
-#else
-#include netware/time_nw.h
-#endif
-/*#include netware/signal_nw.h*/
-/*#include netware/env.h*//* Temporary */
-/*#include process.h*/
 #ifdef USE_WINSOCK
 #include novsock2.h
 #endif
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.153.2.10r2=1.153.2.10.2.1ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.153.2.10 
php-src/main/fopen_wrappers.c:1.153.2.10.2.1
--- php-src/main/fopen_wrappers.c:1.153.2.10Wed Feb  2 18:44:07 2005
+++ php-src/main/fopen_wrappers.c   Tue Jul 26 09:51:33 2005
@@ -16,7 +16,7 @@
|  Jim Winstead [EMAIL PROTECTED] 
|
+--+
  */
-/* $Id: fopen_wrappers.c,v 1.153.2.10 2005/02/02 23:44:07 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.153.2.10.2.1 2005/07/26 13:51:33 hyanantha Exp $ 
*/
 
 /* {{{ includes
  */
@@ -36,14 +36,6 @@
 #include winsock.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,8 +49,6 @@
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include win32/pwd.h
-#elif defined(NETWARE)
-#include netware/pwd.h
 #else
 #include pwd.h
 #endif
http://cvs.php.net/diff.php/php-src/main/user_streams.c?r1=1.29.2.4r2=1.29.2.4.2.1ty=u
Index: php-src/main/user_streams.c
diff -u php-src/main/user_streams.c:1.29.2.4 
php-src/main/user_streams.c:1.29.2.4.2.1
--- php-src/main/user_streams.c:1.29.2.4Mon Jun 21 15:33:47 2004
+++ php-src/main/user_streams.c Tue Jul 26 09:51:34 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: user_streams.c,v 1.29.2.4 2004/06/21 19:33:47 pollita Exp $ */
+/* $Id: user_streams.c,v 1.29.2.4.2.1 2005/07/26 13:51:34 hyanantha Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -647,9 +647,15 @@
STAT_PROP_ENTRY(rdev);
 #endif
STAT_PROP_ENTRY(size);
+#ifdef NETWARE
+   STAT_PROP_ENTRY(atime.tv_sec);
+   STAT_PROP_ENTRY(mtime.tv_sec);
+   STAT_PROP_ENTRY(ctime.tv_sec);
+#else
STAT_PROP_ENTRY(atime);
STAT_PROP_ENTRY(mtime);
STAT_PROP_ENTRY(ctime);
+#endif
 #ifdef HAVE_ST_BLKSIZE
STAT_PROP_ENTRY(blksize);
 #endif
http://cvs.php.net/diff.php/php-src/main/php_scandir.c?r1=1.2.2.7r2=1.2.2.7.2.1ty=u
Index: php-src/main/php_scandir.c
diff -u php-src/main/php_scandir.c:1.2.2.7 
php-src/main/php_scandir.c:1.2.2.7.2.1
--- php-src/main/php_scandir.c:1.2.2.7  Sun Jan  9 16:05:31 2005
+++ php-src/main/php_scandir.c  Tue Jul 26 09:51:34 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_scandir.c,v 1.2.2.7 2005/01/09 21:05:31 sniper Exp $ */
+/* $Id: php_scandir.c,v 1.2.2.7.2.1 2005/07/26 13:51:34 hyanantha Exp $ */
 
 #ifdef PHP_WIN32
 #include config.w32.h
@@ -42,7 +42,10 @@
 #endif  
 
 #include stdlib.h
+
+#ifndef NETWARE
 #include search.h
+#endif
 
 #endif /* HAVE_SCANDIR */
 
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.27r2=1.83.2.27.2.1ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.83.2.27 php-src/main/network.c:1.83.2.27.2.1
--- php-src/main/network.c:1.83.2.27Tue Jan  4 05:35:56 2005
+++ php-src/main/network.c  Tue Jul 26 09:51:34 2005
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: network.c,v 1.83.2.27 2005/01/04 10:35:56

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mysql config.m4

2005-07-26 Thread Anantha Kesari H Y

hyanantha   Tue Jul 26 10:02:02 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mysql  config.m4 
  Log:
  NetWare libmysqlclient library is available as libmysql(olden times 8.3 
limitation). 
  Applying the accepted patches on 5.0 tree.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.54.2.3r2=1.54.2.3.2.1ty=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.54.2.3 
php-src/ext/mysql/config.m4:1.54.2.3.2.1
--- php-src/ext/mysql/config.m4:1.54.2.3Thu Dec 30 02:02:17 2004
+++ php-src/ext/mysql/config.m4 Tue Jul 26 10:02:00 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.54.2.3 2004/12/30 07:02:17 sniper Exp $
+dnl $Id: config.m4,v 1.54.2.3.2.1 2005/07/26 14:02:00 hyanantha Exp $
 dnl
 
 sinclude(ext/mysql/libmysql/acinclude.m4)
@@ -8,7 +8,7 @@
 sinclude(libmysql/mysql.m4)
 
 AC_DEFUN([MYSQL_LIB_CHK], [
-  str=$MYSQL_DIR/$1/libmysqlclient.*
+  str=$MYSQL_DIR/$1/lib$MY_LIBNAME.*
   for j in `echo $str`; do
 if test -r $j; then
   MYSQL_LIB_DIR=$MYSQL_DIR/$1
@@ -114,19 +114,26 @@
 
   MYSQL_MODULE_TYPE=external
 
+  MY_LIBNAME=mysqlclient
+  case $host_alias in
+*netware*[)]
+  MY_LIBNAME=mysql
+  ;;
+  esac
+
   for i in lib lib/mysql; do
 MYSQL_LIB_CHK($i)
   done
 
   if test -z $MYSQL_LIB_DIR; then
-AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR)
+AC_MSG_ERROR(Cannot find lib$MY_LIBNAME library under $MYSQL_DIR)
   fi
 
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ],
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_close, [ ],
   [
 if test $PHP_ZLIB_DIR != no; then
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQL_SHARED_LIBADD)
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [
 AC_MSG_ERROR([mysql configure failed. Please check config.log for more 
information.])
   ], [
 -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR 
@@ -134,7 +141,7 @@
   MYSQL_LIBS=-L$PHP_ZLIB_DIR/lib -lz
 else
   PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [
 AC_MSG_ERROR([Try adding --with-zlib-dir=DIR. Please check 
config.log for more information.])
   ], [
 -L$MYSQL_LIB_DIR
@@ -145,8 +152,8 @@
 -L$MYSQL_LIB_DIR 
   ])
 
-  PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
-  MYSQL_LIBS=-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS
+  PHP_ADD_LIBRARY_WITH_PATH($MY_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
+  MYSQL_LIBS=-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS
 
   PHP_ADD_INCLUDE($MYSQL_INC_DIR)
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dl.c fsock.h lcg.c link.c microtime.c

2005-07-25 Thread Anantha Kesari H Y

hyanantha   Mon Jul 25 09:08:33 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   dl.c fsock.h lcg.c link.c microtime.c 
  Log:
  ext/standard/dl.c
  NetWare LibC dlsym works perfectly only thing that each of the extension need 
to export a symbol with FULL capital prefix. 
  
  ext/standard/fsock.h
  Removing redundant inclusion of headers for NetWare
  
  ext/standard/lcg.c
  NetWare LibC SDK sys/time.h implicitly includes sys/timval.h so nothing 
special needed for NetWare here.
  
  ext/standard/link.c
  NetWare LibC SDK has pwd.h.
  
  ext/standard/microtime.c
  Removing redundant NEW_LIBC checks and nothing special about NetWare here. 
including sys/time.h will do the needful.
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.79.2.3.8.1r2=1.79.2.3.8.2ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.79.2.3.8.1 
php-src/ext/standard/dl.c:1.79.2.3.8.2
--- php-src/ext/standard/dl.c:1.79.2.3.8.1  Sat Jul 23 07:06:52 2005
+++ php-src/ext/standard/dl.c   Mon Jul 25 09:08:32 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dl.c,v 1.79.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */
+/* $Id: dl.c,v 1.79.2.3.8.2 2005/07/25 13:08:32 hyanantha Exp $ */
 
 #include php.h
 #include dl.h
@@ -143,7 +143,6 @@
 
efree(libpath);
 
-#ifndef NETWARE
get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, 
get_module);
 
/*
@@ -154,23 +153,6 @@
 
if (!get_module)
get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, _get_module);
-#else
-   /* NetWare doesn't support two NLMs exporting same symbol */
-   {
-   char symbol_name[64] = \0;
-   int module_name_length = Z_STRLEN_P(file) - 4;  /* '.nlm' is 4 
characters; knock it off */
-
-   /* Take the module name (e.g.: 'php_ldap') and append 
'@get_module' to it */
-   strncpy(symbol_name, Z_STRVAL_P(file), module_name_length);
-   symbol_name[module_name_length] = '\0';
-   strcat(symbol_name, @);
-   strcat(symbol_name, get_module);
-
-   get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, symbol_name);
-   }
-   /* NetWare doesn't prepend '_' to symbol names; so the corresponding 
portion of code is also
-  not required for NetWare */
-#endif
 
if (!get_module) {
DL_UNLOAD(handle);
http://cvs.php.net/diff.php/php-src/ext/standard/fsock.h?r1=1.43.2.1r2=1.43.2.1.8.1ty=u
Index: php-src/ext/standard/fsock.h
diff -u php-src/ext/standard/fsock.h:1.43.2.1 
php-src/ext/standard/fsock.h:1.43.2.1.8.1
--- php-src/ext/standard/fsock.h:1.43.2.1   Tue Dec 31 11:35:28 2002
+++ php-src/ext/standard/fsock.hMon Jul 25 09:08:32 2005
@@ -18,21 +18,13 @@
+--+
 */
 
-/* $Id: fsock.h,v 1.43.2.1 2002/12/31 16:35:28 sebastian Exp $ */
+/* $Id: fsock.h,v 1.43.2.1.8.1 2005/07/25 13:08:32 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
 #ifndef FSOCK_H
 #define FSOCK_H
 
-#ifdef NETWARE
-#ifdef NEW_LIBC
-#include sys/timeval.h
-#else
-#include netware/time_nw.h/* For 'timeval' */
-#endif
-#endif
-
 #include file.h
 
 #include php_network.h
http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.33.2.3.8.1r2=1.33.2.3.8.2ty=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.33.2.3.8.1 
php-src/ext/standard/lcg.c:1.33.2.3.8.2
--- php-src/ext/standard/lcg.c:1.33.2.3.8.1 Sat Jul 23 07:06:52 2005
+++ php-src/ext/standard/lcg.c  Mon Jul 25 09:08:32 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lcg.c,v 1.33.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */
+/* $Id: lcg.c,v 1.33.2.3.8.2 2005/07/25 13:08:32 hyanantha Exp $ */
 
 #include php.h
 #include php_lcg.h
@@ -27,8 +27,6 @@
 
 #ifdef PHP_WIN32
 #include win32/time.h
-#elif defined(NETWARE)
-#include sys/timeval.h
 #else
 #include sys/time.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/link.c?r1=1.42.2.5r2=1.42.2.5.2.1ty=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.42.2.5 
php-src/ext/standard/link.c:1.42.2.5.2.1
--- php-src/ext/standard/link.c:1.42.2.5Mon Nov  1 19:38:07 2004
+++ php-src/ext/standard/link.c Mon Jul 25 09:08:32 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: link.c,v 1.42.2.5 2004/11/02 00:38:07 iliaa Exp $ */
+/* $Id: link.c,v 1.42.2.5.2.1 2005/07/25 13:08:32 hyanantha Exp $ */
 
 #include php.h
 #include php_filestat.h
@@ -33,8 +33,6 @@
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include win32/pwd.h
-#elif defined(NETWARE)
-#include netware/pwd.h
 #else
 #include pwd.h
 #endif
@@ -91,11 +89,7 @@

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard fsock.h lcg.c

2005-07-25 Thread Anantha Kesari H Y

hyanantha   Mon Jul 25 09:10:19 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   lcg.c fsock.h 
  Log:
  ext/standard/fsock.h
  Removing redundant inclusion of headers for NetWare
  
  ext/standard/lcg.c
  NetWare LibC SDK sys/time.h implicitly includes sys/timval.h so nothing 
special needed for NetWare here.
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.38.2.1r2=1.38.2.2ty=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.38.2.1 php-src/ext/standard/lcg.c:1.38.2.2
--- php-src/ext/standard/lcg.c:1.38.2.1 Tue Jun 28 08:48:28 2005
+++ php-src/ext/standard/lcg.c  Mon Jul 25 09:10:18 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lcg.c,v 1.38.2.1 2005/06/28 12:48:28 hyanantha Exp $ */
+/* $Id: lcg.c,v 1.38.2.2 2005/07/25 13:10:18 hyanantha Exp $ */
 
 #include php.h
 #include php_lcg.h
@@ -27,8 +27,6 @@
 
 #ifdef PHP_WIN32
 #include win32/time.h
-#elif defined(NETWARE)
-#include sys/timeval.h
 #else
 #include sys/time.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/fsock.h?r1=1.47.2.1r2=1.47.2.2ty=u
Index: php-src/ext/standard/fsock.h
diff -u php-src/ext/standard/fsock.h:1.47.2.1 
php-src/ext/standard/fsock.h:1.47.2.2
--- php-src/ext/standard/fsock.h:1.47.2.1   Tue Jun 28 10:57:31 2005
+++ php-src/ext/standard/fsock.hMon Jul 25 09:10:19 2005
@@ -18,17 +18,13 @@
+--+
 */
 
-/* $Id: fsock.h,v 1.47.2.1 2005/06/28 14:57:31 hyanantha Exp $ */
+/* $Id: fsock.h,v 1.47.2.2 2005/07/25 13:10:19 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
 #ifndef FSOCK_H
 #define FSOCK_H
 
-#ifdef NETWARE
-#include sys/timeval.h
-#endif
-
 #include file.h
 
 #include php_network.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard fsock.h lcg.c

2005-07-25 Thread Anantha Kesari H Y

hyanantha   Mon Jul 25 09:12:10 2005 EDT

  Modified files:  
/php-src/ext/standard   lcg.c fsock.h 
  Log:
  ext/standard/fsock.h
  Removing redundant inclusion of headers for NetWare
  
  ext/standard/lcg.c
  NetWare LibC SDK sys/time.h implicitly includes sys/timval.h so nothing 
special needed for NetWare here.
  
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.39 php-src/ext/standard/lcg.c:1.40
--- php-src/ext/standard/lcg.c:1.39 Sat Sep 25 10:19:38 2004
+++ php-src/ext/standard/lcg.c  Mon Jul 25 09:12:10 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lcg.c,v 1.39 2004/09/25 14:19:38 hyanantha Exp $ */
+/* $Id: lcg.c,v 1.40 2005/07/25 13:12:10 hyanantha Exp $ */
 
 #include php.h
 #include php_lcg.h
@@ -27,8 +27,6 @@
 
 #ifdef PHP_WIN32
 #include win32/time.h
-#elif defined(NETWARE)
-#include sys/timeval.h
 #else
 #include sys/time.h
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/fsock.h?r1=1.48r2=1.49ty=u
Index: php-src/ext/standard/fsock.h
diff -u php-src/ext/standard/fsock.h:1.48 php-src/ext/standard/fsock.h:1.49
--- php-src/ext/standard/fsock.h:1.48   Sat Sep 25 10:09:45 2004
+++ php-src/ext/standard/fsock.hMon Jul 25 09:12:10 2005
@@ -18,17 +18,13 @@
+--+
 */
 
-/* $Id: fsock.h,v 1.48 2004/09/25 14:09:45 hyanantha Exp $ */
+/* $Id: fsock.h,v 1.49 2005/07/25 13:12:10 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
 #ifndef FSOCK_H
 #define FSOCK_H
 
-#ifdef NETWARE
-#include sys/timeval.h
-#endif
-
 #include file.h
 
 #include php_network.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main php.h

2005-07-25 Thread Anantha Kesari H Y

hyanantha   Mon Jul 25 10:07:16 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/main   php.h 
  Log:
  NetWare LibC SDK has pwd.h and include sys/param.h
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.178.2.14r2=1.178.2.14.2.1ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.178.2.14 php-src/main/php.h:1.178.2.14.2.1
--- php-src/main/php.h:1.178.2.14   Sun Apr 17 09:37:29 2005
+++ php-src/main/php.h  Mon Jul 25 10:07:16 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.178.2.14 2005/04/17 13:37:29 sniper Exp $ */
+/* $Id: php.h,v 1.178.2.14.2.1 2005/07/25 14:07:16 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -199,13 +199,6 @@
 # ifdef PHP_WIN32
 #include win32/pwd.h
 #include win32/param.h
-#elif defined(NETWARE)
-#ifdef NEW_LIBC
-#include sys/param.h
-#else
-#include NetWare/param.h
-#endif
-#include NetWare/pwd.h
 # else
 #include pwd.h
 #include sys/param.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dl.c flock_compat.c lcg.c pack.c

2005-07-23 Thread Anantha Kesari H Y

hyanantha   Sat Jul 23 07:06:53 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   dl.c flock_compat.c lcg.c pack.c 
  Log:
  ext/standard/dl.c
  NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks.
  ext/standard/flock_compat.c
  Removing redundant NEW_LIBC checks
  ext/standard/lcg.c 
  NetWare LibC SDK has sys/timeval.h so removing the redundant NEW_LIBC checks.
  ext/standard/pack.c 
  NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks.
  --Kamesh 
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.79.2.3r2=1.79.2.3.8.1ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.79.2.3 
php-src/ext/standard/dl.c:1.79.2.3.8.1
--- php-src/ext/standard/dl.c:1.79.2.3  Wed Jan 29 10:40:24 2003
+++ php-src/ext/standard/dl.c   Sat Jul 23 07:06:52 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dl.c,v 1.79.2.3 2003/01/29 15:40:24 edink Exp $ */
+/* $Id: dl.c,v 1.79.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */
 
 #include php.h
 #include dl.h
@@ -40,11 +40,7 @@
 #include win32/winutil.h
 #define GET_DL_ERROR() php_win_err()
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include sys/param.h
-#else
-#include netware/param.h
-#endif
 #define GET_DL_ERROR() dlerror()
 #else
 #include sys/param.h
http://cvs.php.net/diff.php/php-src/ext/standard/flock_compat.c?r1=1.21.2.2r2=1.21.2.2.8.1ty=u
Index: php-src/ext/standard/flock_compat.c
diff -u php-src/ext/standard/flock_compat.c:1.21.2.2 
php-src/ext/standard/flock_compat.c:1.21.2.2.8.1
--- php-src/ext/standard/flock_compat.c:1.21.2.2Tue Dec 31 11:35:27 2002
+++ php-src/ext/standard/flock_compat.c Sat Jul 23 07:06:52 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: flock_compat.c,v 1.21.2.2 2002/12/31 16:35:27 sebastian Exp $ */
+/* $Id: flock_compat.c,v 1.21.2.2.8.1 2005/07/23 11:06:52 hyanantha Exp $ */
 
 #include php.h
 #include errno.h
@@ -34,11 +34,7 @@
 #endif
 
 #ifdef NETWARE
-#ifdef NEW_LIBC
 #include netinet/in.h
-#else
-#include sys/socket.h
-#endif
 #endif
 
 #ifndef HAVE_FLOCK
http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.33.2.3r2=1.33.2.3.8.1ty=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.33.2.3 
php-src/ext/standard/lcg.c:1.33.2.3.8.1
--- php-src/ext/standard/lcg.c:1.33.2.3 Mon Mar 31 00:39:45 2003
+++ php-src/ext/standard/lcg.c  Sat Jul 23 07:06:52 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lcg.c,v 1.33.2.3 2003/03/31 05:39:45 sas Exp $ */
+/* $Id: lcg.c,v 1.33.2.3.8.1 2005/07/23 11:06:52 hyanantha Exp $ */
 
 #include php.h
 #include php_lcg.h
@@ -28,12 +28,8 @@
 #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
 
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.40.2.7r2=1.40.2.7.2.1ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.40.2.7 
php-src/ext/standard/pack.c:1.40.2.7.2.1
--- php-src/ext/standard/pack.c:1.40.2.7Tue Jan 25 17:52:19 2005
+++ php-src/ext/standard/pack.c Sat Jul 23 07:06:52 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: pack.c,v 1.40.2.7 2005/01/25 22:52:19 iliaa Exp $ */
+/* $Id: pack.c,v 1.40.2.7.2.1 2005/07/23 11:06:52 hyanantha Exp $ */
 
 #include php.h
 
@@ -32,17 +32,12 @@
 #include win32/param.h
 #elif defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
 #include sys/socket.h
 #endif
-#ifdef NEW_LIBC
 #include sys/param.h
 #else
-#include netware/param.h
-#endif
-#else
 #include sys/param.h
 #endif
 #include ext/standard/head.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_4) /main mergesort.c php_compat.h php_open_temporary_file.c reentrancy.c

2005-07-23 Thread Anantha Kesari H Y

hyanantha   Sat Jul 23 07:45:29 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/main   reentrancy.c php_compat.h php_open_temporary_file.c 
mergesort.c 
  Log:
  main/php_compat.h
  NetWare can make use of Autoconf based build.
  
  main/php_open_temporary_file.c
  NetWare LibC SDK has sys/param.h so removing the redundant NEW_LIBC checks.
  NetWare LibC has mkstemp implementation
  
  main/mergesort.c
  Removing redundant sys/socket.h includes
  
  main/reentrant.c
  Removing the redundant rentrant time function wrappers of NetWare
  
  --Kamesh 
  
  
http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.35.2.2r2=1.35.2.2.4.1ty=u
Index: php-src/main/reentrancy.c
diff -u php-src/main/reentrancy.c:1.35.2.2 
php-src/main/reentrancy.c:1.35.2.2.4.1
--- php-src/main/reentrancy.c:1.35.2.2  Wed Aug 20 12:40:45 2003
+++ php-src/main/reentrancy.c   Sat Jul 23 07:45:28 2005
@@ -28,11 +28,6 @@
 #include win32/readdir.h
 #endif
 
-#if defined(NETWARE)  !(NEW_LIBC)
-/*#include ws2nlm.h*/
-#include sys/socket.h
-#endif
-
 #include php_reentrancy.h
 #include ext/standard/php_rand.h   /* for PHP_RAND_MAX */
 
@@ -119,51 +114,6 @@
 
 #endif
 
-#if defined(NETWARE)
-/*
-   Re-entrant versions of functions seem to be better for loading NLMs in 
different address space.
-   Since we have them now in LibC, we might as well make use of them.
-*/
-
-#define HAVE_LOCALTIME_R 1
-#define HAVE_CTIME_R 1
-#define HAVE_ASCTIME_R 1
-#define HAVE_GMTIME_R 1
-
-PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (localtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
-{
-/* Modified according to LibC definition */
-   if (ctime_r(clock, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
-{
-/* Modified according to LibC definition */
-   if (asctime_r(tm, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (gmtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-#endif /* NETWARE */
-
 #if defined(__BEOS__)
 
 PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.11.4.6r2=1.11.4.6.2.1ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.11.4.6 
php-src/main/php_compat.h:1.11.4.6.2.1
--- php-src/main/php_compat.h:1.11.4.6  Sun Jan  9 16:05:31 2005
+++ php-src/main/php_compat.h   Sat Jul 23 07:45:28 2005
@@ -3,8 +3,6 @@
 
 #ifdef PHP_WIN32
 #include config.w32.h
-#elif defined(NETWARE)
-#include config.nw.h
 #else
 #include php_config.h
 #endif
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.18.2.10r2=1.18.2.10.2.1ty=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.18.2.10 
php-src/main/php_open_temporary_file.c:1.18.2.10.2.1
--- php-src/main/php_open_temporary_file.c:1.18.2.10Fri May  6 12:51:54 2005
+++ php-src/main/php_open_temporary_file.c  Sat Jul 23 07:45:28 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.18.2.10 2005/05/06 16:51:54 tony2001 Exp 
$ */
+/* $Id: php_open_temporary_file.c,v 1.18.2.10.2.1 2005/07/23 11:45:28 
hyanantha Exp $ */
 
 #include php.h
 
@@ -33,18 +33,12 @@
 #include win32/winutil.h
 #elif defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
 #include sys/socket.h
 #endif
-#ifdef NEW_LIBC
 #include sys/param.h
 #else
-#include netware/param.h
-#endif
-#include netware/mktemp.h
-#else
 #include sys/param.h
 #include sys/socket.h
 #include netinet/in.h
@@ -115,10 +109,6 @@
 #endif
;
 #endif
-#ifdef NETWARE
-char *file_path = NULL;
-#endif
-
if (!path) {
return -1;
}
@@ -144,12 +134,6 @@
VCWD_CHMOD(opened_path, 0600);
fd = VCWD_OPEN_MODE(opened_path, open_flags, 0600);
}
-#elif defined(NETWARE)
-   /* Using standard mktemp() implementation for NetWare */
-   file_path = mktemp(opened_path);
-   if (file_path) {
-   fd = VCWD_OPEN(file_path, open_flags);
-   }
 #elif defined(HAVE_MKSTEMP)
fd = mkstemp(opened_path);
 #else
http://cvs.php.net/diff.php/php-src/main/mergesort.c?r1=1.12r2=1.12.14.1ty=u
Index: php-src/main/mergesort.c
diff -u php-src/main/mergesort.c:1.12 php-src/main/mergesort.c:1.12.14.1
--- php-src/main/mergesort.c:1.12   Mon Sep  9 07:17:40 2002
+++ php-src/main/mergesort.cSat Jul 23 07:45:28 2005
@@ -64,11

[PHP-CVS] cvs: php-src(PHP_5_0) /main php_syslog.h

2005-07-22 Thread Anantha Kesari H Y

hyanantha   Fri Jul 22 08:35:10 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   php_syslog.h 
  Log:
  NetWare can make use of Autoconf based build
  
  
http://cvs.php.net/diff.php/php-src/main/php_syslog.h?r1=1.9.2.1r2=1.9.2.2ty=u
Index: php-src/main/php_syslog.h
diff -u php-src/main/php_syslog.h:1.9.2.1 php-src/main/php_syslog.h:1.9.2.2
--- php-src/main/php_syslog.h:1.9.2.1   Sun Jan  9 16:05:17 2005
+++ php-src/main/php_syslog.h   Fri Jul 22 08:35:09 2005
@@ -16,18 +16,13 @@
   +--+
 */
 
-/* $Id: php_syslog.h,v 1.9.2.1 2005/01/09 21:05:17 sniper Exp $ */
+/* $Id: php_syslog.h,v 1.9.2.2 2005/07/22 12:35:09 hyanantha Exp $ */
 
 #ifndef PHP_SYSLOG_H
 #define PHP_SYSLOG_H
 
 #ifdef PHP_WIN32
 #include win32/syslog.h
-#elif defined(NETWARE)
-# include config.nw.h
-#ifdef HAVE_SYSLOG_H
-#include syslog.h
-#endif
 #else
 #include php_config.h
 #ifdef HAVE_SYSLOG_H

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard string.c

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 07:18:38 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   string.c 
  Log:
  NetWare specific dirname fixes.
  --Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.420.2.11r2=1.420.2.12ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.420.2.11 
php-src/ext/standard/string.c:1.420.2.12
--- php-src/ext/standard/string.c:1.420.2.11Thu Jun  2 04:51:10 2005
+++ php-src/ext/standard/string.c   Sat Jul 16 07:18:35 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.420.2.11 2005/06/02 08:51:10 derick Exp $ */
+/* $Id: string.c,v 1.420.2.12 2005/07/16 11:18:35 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1175,6 +1175,22 @@
return len;
}
}
+#elif defined(NETWARE)
+   /*
+* Find the first occurence of : from the left 
+* move the path pointer to the position just after :
+* increment the len_adjust to the length of path till colon 
character(inclusive)
+* If there is no character beyond : simple return len
+*/
+   char *colonpos = NULL;
+   colonpos = strchr(path, ':');
+   if(colonpos != NULL) {
+   len_adjust = ((colonpos - path) + 1);
+   path += len_adjust;
+   if(len_adjust == len) {
+   return len;
+   }
+   }
 #endif
 
if (len == 0) {
@@ -1199,9 +1215,21 @@
}
if (end  path) {
/* No slash found, therefore return '.' */
+#ifdef NETWARE
+   if(len_adjust == 0) {
+   path[0] = '.';
+   path[1] = '\0';
+   return 1; //only one character
+   } 
+   else {
+   path[0] = '\0';
+   return len_adjust;
+   }
+#else
path[0] = '.';
path[1] = '\0';
return 1 + len_adjust;
+#endif
}
 
/* Strip slashes which came before the file name */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main fopen_wrappers.c main.c php_open_temporary_file.c php_streams.h safe_mode.c

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:14:47 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   fopen_wrappers.c main.c php_open_temporary_file.c 
php_streams.h safe_mode.c 
  Log:
  main/fopen_wrappers.c
  NetWare file names are case insensitive
  main/main.c
  NetWare has no sendmail binary. It uses the smart host mailing code 
avaiolable in php distro. Could not find a better place to put this than 
main/main.c.
  main/php_open_temporary_file.c,v
  Removed the unused variable in NetWare block.
  main/php_streams.h
  Removing the redundant CLIB_STAT_PATCH
  main/safe_mode.c
  NetWare has no uid.
  -- Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.170.2.3r2=1.170.2.4ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.170.2.3 
php-src/main/fopen_wrappers.c:1.170.2.4
--- php-src/main/fopen_wrappers.c:1.170.2.3 Wed Jun 22 07:23:35 2005
+++ php-src/main/fopen_wrappers.c   Sat Jul 16 08:14:44 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.170.2.3 2005/06/22 11:23:35 hyanantha Exp $ */
+/* $Id: fopen_wrappers.c,v 1.170.2.4 2005/07/16 12:14:44 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -124,7 +124,7 @@
}
 
/* Check the path */
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || defined(NETWARE)
if (strncasecmp(resolved_basedir, resolved_name, 
resolved_basedir_len) == 0) {
 #else
if (strncmp(resolved_basedir, resolved_name, 
resolved_basedir_len) == 0) {
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.20r2=1.604.2.21ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.20 php-src/main/main.c:1.604.2.21
--- php-src/main/main.c:1.604.2.20  Tue Jul  5 10:14:03 2005
+++ php-src/main/main.c Sat Jul 16 08:14:44 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.604.2.20 2005/07/05 14:14:03 dmitry Exp $ */
+/* $Id: main.c,v 1.604.2.21 2005/07/16 12:14:44 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -222,7 +222,7 @@
 #  define PHP_SAFE_MODE_EXEC_DIR 
 #endif
 
-#ifdef PHP_PROG_SENDMAIL
+#if defined(PHP_PROG_SENDMAIL)  !defined(NETWARE) 
 #  define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL  -t -i 
 #else
 #  define DEFAULT_SENDMAIL_PATH NULL
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.30.2.3r2=1.30.2.4ty=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.30.2.3 
php-src/main/php_open_temporary_file.c:1.30.2.4
--- php-src/main/php_open_temporary_file.c:1.30.2.3 Tue Jun 28 11:27:49 2005
+++ php-src/main/php_open_temporary_file.c  Sat Jul 16 08:14:45 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.30.2.3 2005/06/28 15:27:49 hyanantha Exp 
$ */
+/* $Id: php_open_temporary_file.c,v 1.30.2.4 2005/07/16 12:14:45 hyanantha Exp 
$ */
 
 #include php.h
 
@@ -107,10 +107,6 @@
 #endif
;
 #endif
-#ifdef NETWARE
-char *file_path = NULL;
-#endif
-
if (!path) {
return -1;
}
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.95.2.4r2=1.95.2.5ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.95.2.4 php-src/main/php_streams.h:1.95.2.5
--- php-src/main/php_streams.h:1.95.2.4 Mon May 16 04:37:41 2005
+++ php-src/main/php_streams.h  Sat Jul 16 08:14:45 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_streams.h,v 1.95.2.4 2005/05/16 08:37:41 tony2001 Exp $ */
+/* $Id: php_streams.h,v 1.95.2.5 2005/07/16 12:14:45 hyanantha Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -103,11 +103,7 @@
 #include streams/php_stream_filter_api.h
 
 typedef struct _php_stream_statbuf {
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc sb; /* regular info */
-#else
struct stat sb; /* regular info */
-#endif
/* extended info to go here some day: content-type etc. etc. */
 } php_stream_statbuf;
 
http://cvs.php.net/diff.php/php-src/main/safe_mode.c?r1=1.58.2.1r2=1.58.2.2ty=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.58.2.1 php-src/main/safe_mode.c:1.58.2.2
--- php-src/main/safe_mode.c:1.58.2.1   Wed Dec  1 17:37:47 2004
+++ php-src/main/safe_mode.cSat Jul 16 08:14:45 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.58.2.1 2004/12/01 22:37:47 sesser Exp $ */
+/* $Id: safe_mode.c,v 1.58.2.2 2005/07/16 12:14:45 hyanantha Exp $ */
 
 #include php.h
 
@@ -190,7 +190,12 @@
 }
 
 PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode) {
+#ifdef NETWARE
+   /* NetWare don't have

[PHP-CVS] cvs: php-src /main fopen_wrappers.c main.c

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:21:35 2005 EDT

  Modified files:  
/php-src/main   fopen_wrappers.c main.c 
  Log:
  main/fopen_wrappers.c
  NetWare file names are case insensitive
  main/main.c
  NetWare has no sendmail binary. It uses the smart host mailing code 
avaiolable in php distro. Could not find a better place to put this than 
main/main.c.
  -- Kamesh
  
  
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.173r2=1.174ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.173 php-src/main/fopen_wrappers.c:1.174
--- php-src/main/fopen_wrappers.c:1.173 Wed Feb 23 03:56:47 2005
+++ php-src/main/fopen_wrappers.c   Sat Jul 16 08:21:34 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.173 2005/02/23 08:56:47 hyanantha Exp $ */
+/* $Id: fopen_wrappers.c,v 1.174 2005/07/16 12:21:34 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -123,7 +123,7 @@
}
 
/* Check the path */
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || defined(NETWARE)
if (strncasecmp(resolved_basedir, resolved_name, 
resolved_basedir_len) == 0) {
 #else
if (strncmp(resolved_basedir, resolved_name, 
resolved_basedir_len) == 0) {
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.636r2=1.637ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.636 php-src/main/main.c:1.637
--- php-src/main/main.c:1.636   Tue Jul 12 12:53:29 2005
+++ php-src/main/main.c Sat Jul 16 08:21:34 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.636 2005/07/12 16:53:29 iliaa Exp $ */
+/* $Id: main.c,v 1.637 2005/07/16 12:21:34 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -222,7 +222,7 @@
 #  define PHP_SAFE_MODE_EXEC_DIR 
 #endif
 
-#ifdef PHP_PROG_SENDMAIL
+#if defined(PHP_PROG_SENDMAIL)  !defined(NETWARE)
 #  define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL  -t -i 
 #else
 #  define DEFAULT_SENDMAIL_PATH NULL

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2filter php_apache.h sapi_apache2.c

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:30:11 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/sapi/apache2filter php_apache.h sapi_apache2.c 
  Log:
  sapi/apache2filter/php_apache.h
  Removing redundant CLIB_STAT_PATCH
  sapi/apache2filter/sapi_apache2.c
  Removing redundant CLIB_STAT_PATCH
  -- Kamesh
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/php_apache.h?r1=1.23r2=1.23.2.1ty=u
Index: php-src/sapi/apache2filter/php_apache.h
diff -u php-src/sapi/apache2filter/php_apache.h:1.23 
php-src/sapi/apache2filter/php_apache.h:1.23.2.1
--- php-src/sapi/apache2filter/php_apache.h:1.23Thu Jan  8 12:33:17 2004
+++ php-src/sapi/apache2filter/php_apache.h Sat Jul 16 08:30:10 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_apache.h,v 1.23 2004/01/08 17:33:17 sniper Exp $ */
+/* $Id: php_apache.h,v 1.23.2.1 2005/07/16 12:30:10 hyanantha Exp $ */
 
 #ifndef PHP_APACHE_H
 #define PHP_APACHE_H
@@ -41,11 +41,7 @@
/* Index for reading from buffer */
int post_idx;
/* stat structure of the current file */
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc finfo;
-#else
struct stat finfo;
-#endif
/* Buffer for request body filter */
char *post_data;
/* Whether or not we've processed PHP in the output filters yet. */
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.125.2.4r2=1.125.2.5ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4 
php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.5
--- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4 Mon Jun 20 08:46:52 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c   Sat Jul 16 08:30:10 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.125.2.4 2005/06/20 12:46:52 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.125.2.5 2005/07/16 12:30:10 hyanantha Exp $ */
 
 #include fcntl.h
 
@@ -171,7 +171,7 @@
ctx-finfo.st_gid = ctx-r-finfo.group;
ctx-finfo.st_dev = ctx-r-finfo.device;
ctx-finfo.st_ino = ctx-r-finfo.inode;
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
+#ifdef NETWARE
ctx-finfo.st_atime.tv_sec = ctx-r-finfo.atime/100;
ctx-finfo.st_mtime.tv_sec = ctx-r-finfo.mtime/100;
ctx-finfo.st_ctime.tv_sec = ctx-r-finfo.ctime/100;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware/libpq libpq-fs.h

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:47:18 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netware/libpq  libpq-fs.h 
  Log:
  removing the redundant file libpq-fs.h
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware ApacheCore.imp BisonExtStandard.bat BisonFlexZend.bat ZendEngine2.mak build.bat buildext.bat buildlib.bat buildsapi.bat common.mif libpq-fe.h libpq.imp php-nw.

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:50:53 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwareApacheCore.imp BisonExtStandard.bat 
BisonFlexZend.bat ZendEngine2.mak build.bat 
buildext.bat buildlib.bat buildsapi.bat common.mif 
libpq-fe.h libpq.imp php-nw.bat php5apache.mak 
php5apache2filter.mak php5cli.mak phplib.imp 
phplib.mak phptest.ncf postgres_ext.h setbuild.bat 
time_nw.c tsrm.mak zend.mak 
  Log:
  NetWare can make use the AutoConf based build system
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware ApacheCore.imp BisonExtStandard.bat BisonFlexZend.bat ZendEngine2.mak build.bat buildext.bat buildlib.bat buildsapi.bat common.mif libpq-fe.h libpq.imp php-nw.bat php5a

2005-07-16 Thread Anantha Kesari H Y

hyanantha   Sat Jul 16 08:55:45 2005 EDT

  Removed files:   
/php-src/netwareApacheCore.imp BisonExtStandard.bat 
BisonFlexZend.bat ZendEngine2.mak build.bat 
buildext.bat buildlib.bat buildsapi.bat common.mif 
libpq-fe.h libpq.imp php-nw.bat php5apache.mak 
php5apache2filter.mak php5cli.mak phplib.imp 
phplib.mak phptest.ncf postgres_ext.h setbuild.bat 
time_nw.c tsrm.mak zend.mak 
  Log:
  NetWare can make use of the Autoconf based build system
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard file.h filestat.c link.c pageinfo.c syslog.c

2005-07-15 Thread Anantha Kesari H Y

hyanantha   Fri Jul 15 05:29:21 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   file.h filestat.c link.c pageinfo.c syslog.c 
  Log:
  ext/standard/file.h NetWare LibC has fnmatch and realpath implemented.
  ext/standard/filestat.c Removing redundant CLIB_STAT_PATCH and fixing some 
NetWare specific stat structure.
  ext/standard/link.c Removing redundant CLIB_STAT_PATCH.
  ext/standard/pageinfo.c Removing redundant CLIB_STAT_PATCH and fixing some 
NetWare specific stat structure.
  ext/standard/syslog.c Except LOG_SYSLOG NetWare LibC has other macros defined.
  
  -- Kamesh
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.h?r1=1.90r2=1.90.2.1ty=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.90 php-src/ext/standard/file.h:1.90.2.1
--- php-src/ext/standard/file.h:1.90Mon Jun 21 17:08:05 2004
+++ php-src/ext/standard/file.h Fri Jul 15 05:29:18 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: file.h,v 1.90 2004/06/21 21:08:05 pollita Exp $ */
+/* $Id: file.h,v 1.90.2.1 2005/07/15 09:29:18 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
 
@@ -59,7 +59,7 @@
 PHP_FUNCTION(flock);
 PHP_FUNCTION(fd_set);
 PHP_FUNCTION(fd_isset);
-#if (!defined(__BEOS__)  !defined(NETWARE)  HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__)  HAVE_REALPATH) || defined(ZTS)
 PHP_FUNCTION(realpath);
 PHP_FUNCTION(fnmatch);
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.130.2.3r2=1.130.2.4ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.130.2.3 
php-src/ext/standard/filestat.c:1.130.2.4
--- php-src/ext/standard/filestat.c:1.130.2.3   Tue Jun 28 11:14:22 2005
+++ php-src/ext/standard/filestat.c Fri Jul 15 05:29:18 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.130.2.3 2005/06/28 15:14:22 hyanantha Exp $ */
+/* $Id: filestat.c,v 1.130.2.4 2005/07/15 09:29:18 hyanantha Exp $ */
 
 #include php.h
 #include safe_mode.h
@@ -464,11 +464,7 @@
 {
pval **filename, **filetime, **fileatime;
int ret;
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc sb;
-#else
struct stat sb;
-#endif
FILE *file;
struct utimbuf newtimebuf;
struct utimbuf *newtime = NULL;
@@ -550,11 +546,7 @@
 {
zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid, 
*stat_gid, *stat_rdev,
*stat_size, *stat_atime, *stat_mtime, *stat_ctime, 
*stat_blksize, *stat_blocks;
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
-   struct stat_libc *stat_sb;
-#else
struct stat *stat_sb;
-#endif
php_stream_statbuf ssb;
int flags = 0, rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access 
rights defaults to other */
char *stat_sb_names[13]={dev, ino, mode, nlink, uid, gid, 
rdev,
@@ -644,19 +636,19 @@
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
 #ifdef NETWARE
-   RETURN_LONG((long)((stat_sb-st_atime).tv_sec));
+   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)((stat_sb-st_mtime).tv_sec));
+   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)((stat_sb-st_ctime).tv_sec));
+   RETURN_LONG((long)ssb.sb.st_ctime.tv_sec);
 #else
RETURN_LONG((long)ssb.sb.st_ctime);
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/link.c?r1=1.48.2.2r2=1.48.2.3ty=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.48.2.2 
php-src/ext/standard/link.c:1.48.2.3
--- php-src/ext/standard/link.c:1.48.2.2Fri Mar 11 03:51:08 2005
+++ php-src/ext/standard/link.c Fri Jul 15 05:29:19 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: link.c,v 1.48.2.2 2005/03/11 08:51:08 hyanantha Exp $ */
+/* $Id: link.c,v 1.48.2.3 2005/07/15 09:29:19 hyanantha Exp $ */
 
 #include php.h
 #include php_filestat.h
@@ -89,11 +89,7 @@
 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) {
http://cvs.php.net/diff.php/php-src/ext/standard/pageinfo.c?r1=1.37.2.1r2=1.37.2.2ty=u
Index: php-src/ext/standard/pageinfo.c
diff -u php-src/ext/standard/pageinfo.c:1.37.2.1 
php-src/ext/standard/pageinfo.c:1.37.2.2
--- php-src/ext/standard/pageinfo.c:1.37.2.1Thu Mar 10 07:26:14 2005
+++

[PHP-CVS] cvs: php-src /ext/standard file.h string.c syslog.c

2005-07-15 Thread Anantha Kesari H Y

hyanantha   Fri Jul 15 08:35:13 2005 EDT

  Modified files:  
/php-src/ext/standard   file.h syslog.c string.c 
  Log:
  ext/standard/file.h NetWare LibC has fnmatch and realpath implemented.
  ext/standard/syslog.c Except LOG_SYSLOG other syslog macros are supported by 
NetWare LibC.
  ext/standard/string.c NetWare fix for dirname
  -- Kamesh
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.h?r1=1.92r2=1.93ty=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.92 php-src/ext/standard/file.h:1.93
--- php-src/ext/standard/file.h:1.92Sun Sep 26 17:55:22 2004
+++ php-src/ext/standard/file.h Fri Jul 15 08:35:12 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: file.h,v 1.92 2004/09/26 21:55:22 helly Exp $ */
+/* $Id: file.h,v 1.93 2005/07/15 12:35:12 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
 
@@ -60,7 +60,7 @@
 PHP_FUNCTION(flock);
 PHP_FUNCTION(fd_set);
 PHP_FUNCTION(fd_isset);
-#if (!defined(__BEOS__)  !defined(NETWARE)  HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__)  HAVE_REALPATH) || defined(ZTS)
 PHP_FUNCTION(realpath);
 PHP_FUNCTION(fnmatch);
 #endif
http://cvs.php.net/diff.php/php-src/ext/standard/syslog.c?r1=1.47r2=1.48ty=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.47 php-src/ext/standard/syslog.c:1.48
--- php-src/ext/standard/syslog.c:1.47  Wed Jul 28 22:59:43 2004
+++ php-src/ext/standard/syslog.c   Fri Jul 15 08:35:12 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: syslog.c,v 1.47 2004/07/29 02:59:43 wez Exp $ */
+/* $Id: syslog.c,v 1.48 2005/07/15 12:35:12 hyanantha Exp $ */
 
 #include php.h
 
@@ -75,7 +75,7 @@
/* AIX doesn't have LOG_AUTHPRIV */
REGISTER_LONG_CONSTANT(LOG_AUTHPRIV, LOG_AUTHPRIV, CONST_CS | 
CONST_PERSISTENT);
 #endif
-#if !defined(PHP_WIN32)  !defined(NETWARE)
+#ifndef PHP_WIN32
REGISTER_LONG_CONSTANT(LOG_LOCAL0, LOG_LOCAL0, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(LOG_LOCAL1, LOG_LOCAL1, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(LOG_LOCAL2, LOG_LOCAL2, CONST_CS | 
CONST_PERSISTENT);
@@ -144,7 +144,9 @@
SET_VAR_LONG(LOG_MAIL, LOG_MAIL); /* log to email */
SET_VAR_LONG(LOG_DAEMON, LOG_DAEMON); /* other system daemons */
SET_VAR_LONG(LOG_AUTH, LOG_AUTH);
+#ifndef NETWARE
SET_VAR_LONG(LOG_SYSLOG, LOG_SYSLOG);
+#endif
SET_VAR_LONG(LOG_LPR, LOG_LPR);
 #ifdef LOG_NEWS
/* No LOG_NEWS on HP-UX */
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.442r2=1.443ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.442 php-src/ext/standard/string.c:1.443
--- php-src/ext/standard/string.c:1.442 Thu Jul  7 11:19:40 2005
+++ php-src/ext/standard/string.c   Fri Jul 15 08:35:12 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.442 2005/07/07 15:19:40 tony2001 Exp $ */
+/* $Id: string.c,v 1.443 2005/07/15 12:35:12 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1225,6 +1225,22 @@
return len;
}
}
+#elif defined(NETWARE)
+   /*
+* Find the first occurence of : from the left 
+* move the path pointer to the position just after :
+* increment the len_adjust to the length of path till colon 
character(inclusive)
+* If there is no character beyond : simple return len
+*/
+   char *colonpos = NULL;
+   colonpos = strchr(path, ':');
+   if(colonpos != NULL) {
+   len_adjust = ((colonpos - path) + 1);
+   path += len_adjust;
+   if(len_adjust == len) {
+   return len;
+   }
+   }
 #endif
 
if (len == 0) {
@@ -1249,9 +1265,21 @@
}
if (end  path) {
/* No slash found, therefore return '.' */
+#ifdef NETWARE
+   if(len_adjust == 0) {
+   path[0] = '.';
+   path[1] = '\0';
+   return 1; //only one character
+   } 
+   else {
+   path[0] = '\0';
+   return len_adjust;
+   }
+#else
path[0] = '.';
path[1] = '\0';
return 1 + len_adjust;
+#endif
}
 
/* Strip slashes which came before the file name */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard proc_open.c

2005-07-01 Thread Anantha Kesari H Y

hyanantha   Fri Jul  1 02:49:30 2005 EDT

  Modified files:  
/php-src/ext/standard   proc_open.c 
  Log:
  As fork implementation of NetWare LibC still in experimental stages making 
the procve based solution ahead of HAVE_FORK. Later When fork becomes stable 
will revert this fix.
  --Kamesh from hyanantha's account
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.34r2=1.35ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.34 
php-src/ext/standard/proc_open.c:1.35
--- php-src/ext/standard/proc_open.c:1.34   Mon Jun 20 07:10:11 2005
+++ php-src/ext/standard/proc_open.cFri Jul  1 02:49:29 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: proc_open.c,v 1.34 2005/06/20 11:10:11 sniper Exp $ */
+/* $Id: proc_open.c,v 1.35 2005/07/01 06:49:29 hyanantha Exp $ */
 
 #if 0  (defined(__linux__) || defined(sun) || defined(__IRIX__))
 # define _BSD_SOURCE   /* linux wants this when XOPEN mode is on */
@@ -761,6 +761,46 @@
child = pi.hProcess;
CloseHandle(pi.hThread);
 
+#elif defined(NETWARE)
+   if (cwd) {
+   orig_cwd = getcwd(NULL, PATH_MAX);
+   chdir2(cwd);
+   }
+   channel.infd = descriptors[0].childend;
+   channel.outfd = descriptors[1].childend;
+   channel.errfd = -1;
+   /* Duplicate the command as processing downwards will modify it*/
+   command_dup = strdup(command);
+   /* get a number of args */
+   construct_argc_argv(command_dup, NULL, command_num_args, NULL);
+   child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*));
+   if(!child_argv) {
+   free(command_dup);
+   if (cwd  orig_cwd) {
+   chdir2(orig_cwd);
+   free(orig_cwd);
+   }
+   }
+   /* fill the child arg vector */
+   construct_argc_argv(command_dup, NULL, command_num_args, child_argv);
+   child_argv[command_num_args] = NULL;
+   child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL, 
channel, NULL, NULL, 0, NULL, (const char**)child_argv);
+   free(child_argv);
+   free(command_dup);
+   if (cwd  orig_cwd) {
+   chdir2(orig_cwd);
+   free(orig_cwd);
+   }
+   if (child  0) {
+   /* failed to fork() */
+   /* clean up all the descriptors */
+   for (i = 0; i  ndesc; i++) {
+   close(descriptors[i].childend);
+   close(descriptors[i].parentend);
+   }
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, procve failed - 
%s, strerror(errno));
+   goto exit_fail;
+   }
 #elif HAVE_FORK
/* the unix way */
child = fork();
@@ -831,46 +871,6 @@
goto exit_fail;
 
}
-#elif defined(NETWARE)
-   if (cwd) {
-   orig_cwd = getcwd(NULL, PATH_MAX);
-   chdir2(cwd);
-   }
-   channel.infd = descriptors[0].childend;
-   channel.outfd = descriptors[1].childend;
-   channel.errfd = -1;
-   /* Duplicate the command as processing downwards will modify it*/
-   command_dup = strdup(command);
-   /* get a number of args */
-   construct_argc_argv(command_dup, NULL, command_num_args, NULL);
-   child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*));
-   if(!child_argv) {
-   free(command_dup);
-   if (cwd  orig_cwd) {
-   chdir2(orig_cwd);
-   free(orig_cwd);
-   }
-   }
-   /* fill the child arg vector */
-   construct_argc_argv(command_dup, NULL, command_num_args, child_argv);
-   child_argv[command_num_args] = NULL;
-   child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL, 
channel, NULL, NULL, 0, NULL, (const char**)child_argv);
-   free(child_argv);
-   free(command_dup);
-   if (cwd  orig_cwd) {
-   chdir2(orig_cwd);
-   free(orig_cwd);
-   }
-   if (child  0) {
-   /* failed to fork() */
-   /* clean up all the descriptors */
-   for (i = 0; i  ndesc; i++) {
-   close(descriptors[i].childend);
-   close(descriptors[i].parentend);
-   }
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, procve failed - 
%s, strerror(errno));
-   goto exit_fail;
-   }
 #else
 # error You lose (configure should not have let you get here)
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main reentrancy.c

2005-07-01 Thread Anantha Kesari H Y

hyanantha   Fri Jul  1 03:55:30 2005 EDT

  Modified files:  
/php-src/main   reentrancy.c 
  Log:
  NetWare LibC has reentrant time functions no need to have this.
  -- Kamesh from hyanantha's account
  
  
http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.41r2=1.42ty=u
Index: php-src/main/reentrancy.c
diff -u php-src/main/reentrancy.c:1.41 php-src/main/reentrancy.c:1.42
--- php-src/main/reentrancy.c:1.41  Wed Sep 29 08:25:56 2004
+++ php-src/main/reentrancy.c   Fri Jul  1 03:55:28 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: reentrancy.c,v 1.41 2004/09/29 12:25:56 hyanantha Exp $ */
+/* $Id: reentrancy.c,v 1.42 2005/07/01 07:55:28 hyanantha Exp $ */
 
 #include sys/types.h
 #include string.h
@@ -115,51 +115,6 @@
 
 #endif
 
-#if defined(NETWARE)
-/*
-   Re-entrant versions of functions seem to be better for loading NLMs in 
different address space.
-   Since we have them now in LibC, we might as well make use of them.
-*/
-
-#define HAVE_LOCALTIME_R 1
-#define HAVE_CTIME_R 1
-#define HAVE_ASCTIME_R 1
-#define HAVE_GMTIME_R 1
-
-PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (localtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
-{
-/* Modified according to LibC definition */
-   if (ctime_r(clock, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
-{
-/* Modified according to LibC definition */
-   if (asctime_r(tm, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (gmtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-#endif /* NETWARE */
-
 #if defined(__BEOS__)
 
 PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main reentrancy.c

2005-07-01 Thread Anantha Kesari H Y

hyanantha   Fri Jul  1 04:00:45 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   reentrancy.c 
  Log:
  NetWare LibC has reentrant versions of time functions this code is of no use.
  -- Kamesh from hyanantha's account
  
  
http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.40.2.1r2=1.40.2.2ty=u
Index: php-src/main/reentrancy.c
diff -u php-src/main/reentrancy.c:1.40.2.1 php-src/main/reentrancy.c:1.40.2.2
--- php-src/main/reentrancy.c:1.40.2.1  Wed Jun 29 02:46:59 2005
+++ php-src/main/reentrancy.c   Fri Jul  1 04:00:44 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: reentrancy.c,v 1.40.2.1 2005/06/29 06:46:59 hyanantha Exp $ */
+/* $Id: reentrancy.c,v 1.40.2.2 2005/07/01 08:00:44 hyanantha Exp $ */
 
 #include sys/types.h
 #include string.h
@@ -115,51 +115,6 @@
 
 #endif
 
-#if defined(NETWARE)
-/*
-   Re-entrant versions of functions seem to be better for loading NLMs in 
different address space.
-   Since we have them now in LibC, we might as well make use of them.
-*/
-
-#define HAVE_LOCALTIME_R 1
-#define HAVE_CTIME_R 1
-#define HAVE_ASCTIME_R 1
-#define HAVE_GMTIME_R 1
-
-PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (localtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
-{
-/* Modified according to LibC definition */
-   if (ctime_r(clock, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
-{
-/* Modified according to LibC definition */
-   if (asctime_r(tm, buf) != NULL)
-   return (buf);
-   return (NULL);
-}
-
-PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)
-{
-/* Modified according to LibC definition */
-   if (gmtime_r(timep, p_tm) != NULL)
-   return (p_tm);
-   return (NULL);
-}
-
-#endif /* NETWARE */
-
 #if defined(__BEOS__)
 
 PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard proc_open.c

2005-06-30 Thread Anantha Kesari H Y

hyanantha   Fri Jul  1 01:53:06 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   proc_open.c 
  Log:
  As fork implementation of NetWare LibC still in experimental stages making 
the procve based solution ahead of HAVE_FORK. Later When fork becomes stable 
will revert this fix. 
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.28.2.4r2=1.28.2.5ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.28.2.4 
php-src/ext/standard/proc_open.c:1.28.2.5
--- php-src/ext/standard/proc_open.c:1.28.2.4   Thu Apr  7 19:08:48 2005
+++ php-src/ext/standard/proc_open.cFri Jul  1 01:53:06 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: proc_open.c,v 1.28.2.4 2005/04/07 23:08:48 iliaa Exp $ */
+/* $Id: proc_open.c,v 1.28.2.5 2005/07/01 05:53:06 hyanantha Exp $ */
 
 #if 0  (defined(__linux__) || defined(sun) || defined(__IRIX__))
 # define _BSD_SOURCE   /* linux wants this when XOPEN mode is on */
@@ -35,6 +35,11 @@
 #include php_globals.h
 #include SAPI.h
 
+#ifdef NETWARE
+#include proc.h
+#include library.h
+#endif
+
 #if HAVE_SYS_WAIT_H
 #include sys/wait.h
 #endif
@@ -486,6 +491,13 @@
char *command_with_cmd;
UINT old_error_mode;
 #endif
+#ifdef NETWARE
+   char** child_argv = NULL;
+   char* command_dup = NULL;
+   char* orig_cwd = NULL;
+   int command_num_args = 0;
+   wiring_t channel;
+#endif
php_process_id_t child;
struct php_process_handle *proc;
int is_persistent = 0; /* TODO: ensure that persistent procs will work 
*/
@@ -749,6 +761,46 @@
child = pi.hProcess;
CloseHandle(pi.hThread);
 
+#elif defined(NETWARE)
+   if (cwd) {
+   orig_cwd = getcwd(NULL, PATH_MAX);
+   chdir2(cwd);
+   }
+   channel.infd = descriptors[0].childend;
+   channel.outfd = descriptors[1].childend;
+   channel.errfd = -1;
+   /* Duplicate the command as processing downwards will modify it*/
+   command_dup = strdup(command);
+   /* get a number of args */
+   construct_argc_argv(command_dup, NULL, command_num_args, NULL);
+   child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*));
+   if(!child_argv) {
+   free(command_dup);
+   if (cwd  orig_cwd) {
+   chdir2(orig_cwd);
+   free(orig_cwd);
+   }
+   }
+   /* fill the child arg vector */
+   construct_argc_argv(command_dup, NULL, command_num_args, child_argv);
+   child_argv[command_num_args] = NULL;
+   child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL, 
channel, NULL, NULL, 0, NULL, (const char**)child_argv);
+   free(child_argv);
+   free(command_dup);
+   if (cwd  orig_cwd) {
+   chdir2(orig_cwd);
+   free(orig_cwd);
+   }
+   if (child  0) {
+   /* failed to fork() */
+   /* clean up all the descriptors */
+   for (i = 0; i  ndesc; i++) {
+   close(descriptors[i].childend);
+   close(descriptors[i].parentend);
+   }
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, procve failed - 
%s, strerror(errno));
+   goto exit_fail;
+   }
 #elif HAVE_FORK
/* the unix way */
child = fork();


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main mergesort.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 02:28:32 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   mergesort.c 
  Log:
  removing unwanted NetWare code
  
  
http://cvs.php.net/diff.php/php-src/main/mergesort.c?r1=1.14r2=1.14.2.1ty=u
Index: php-src/main/mergesort.c
diff -u php-src/main/mergesort.c:1.14 php-src/main/mergesort.c:1.14.2.1
--- php-src/main/mergesort.c:1.14   Wed Feb 19 03:40:18 2003
+++ php-src/main/mergesort.cWed Jun 29 02:28:31 2005
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: mergesort.c,v 1.14 2003/02/19 08:40:18 sniper Exp $ */
+/* $Id: mergesort.c,v 1.14.2.1 2005/06/29 06:28:31 hyanantha Exp $ */
 
 #if defined(LIBC_SCCS)  !defined(lint)
 static char sccsid[] = @(#)merge.c8.2 (Berkeley) 2/14/94;
@@ -66,11 +66,6 @@
 #include winsock2.h /* Includes definition for u_char */
 #endif
 
-#if defined(NETWARE)  !defined(NEW_LIBC)
-/*#include ws2nlm.h*/
-#include sys/socket.h
-#endif
-
 static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int 
(*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
 static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const 
void *, const void * TSRMLS_DC) TSRMLS_DC);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main php.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 02:41:17 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   php.h 
  Log:
  Removing unwanted NetWare Code
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203.2.10r2=1.203.2.11ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.203.2.10 php-src/main/php.h:1.203.2.11
--- php-src/main/php.h:1.203.2.10   Sun Apr 17 09:37:45 2005
+++ php-src/main/php.h  Wed Jun 29 02:41:15 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.203.2.10 2005/04/17 13:37:45 sniper Exp $ */
+/* $Id: php.h,v 1.203.2.11 2005/06/29 06:41:15 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -248,19 +248,9 @@
 
 /* global variables */
 #if !defined(PHP_WIN32)
-#ifdef NETWARE
-#ifdef NEW_LIBC
-#define php_sleep sleep
-#else  /* NEW_LIBC */
-#define php_sleep   delay   /* sleep() and usleep() are not available */
-#define usleep  delay
-#endif /* NEW_LIBC */
-extern char **environ;
-#else  /* NETWARE */
 extern char **environ;
 #define php_sleep sleep
 #define PHP_SLEEP_NON_VOID
-#endif /*  NETWARE */
 #endif /* !defined(PHP_WIN32) */
 
 #ifdef PHP_PWRITE_64

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main reentrancy.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 02:46:59 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   reentrancy.c 
  Log:
  removed the unwanted NetWare Code
  
  
http://cvs.php.net/diff.php/php-src/main/reentrancy.c?r1=1.40r2=1.40.2.1ty=u
Index: php-src/main/reentrancy.c
diff -u php-src/main/reentrancy.c:1.40 php-src/main/reentrancy.c:1.40.2.1
--- php-src/main/reentrancy.c:1.40  Thu Jan  8 03:17:54 2004
+++ php-src/main/reentrancy.c   Wed Jun 29 02:46:59 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: reentrancy.c,v 1.40 2004/01/08 08:17:54 andi Exp $ */
+/* $Id: reentrancy.c,v 1.40.2.1 2005/06/29 06:46:59 hyanantha Exp $ */
 
 #include sys/types.h
 #include string.h
@@ -29,11 +29,6 @@
 #include win32/readdir.h
 #endif
 
-#if defined(NETWARE)  !(NEW_LIBC)
-/*#include ws2nlm.h*/
-#include sys/socket.h
-#endif
-
 #include php_reentrancy.h
 #include ext/standard/php_rand.h   /* for PHP_RAND_MAX */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware pwd.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 03:02:58 2005 EDT

  Removed files:   
/php-src/netwarepwd.h 
  Log:
  removing pwd.h as NetWare LibC itself supplies pwd.h
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware mktemp.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 04:33:23 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwaremktemp.h 
  Log:
  mktemp functionality is part of Regular NetWare LibC
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware mktemp.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 04:34:20 2005 EDT

  Removed files:   
/php-src/netwaremktemp.h 
  Log:
  mktemp functionality is part of Regular LibC
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware pipe.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 04:58:19 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwarepipe.c 
  Log:
  NetWare LibC has a pipe and popen implentation
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware pipe.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 04:59:30 2005 EDT

  Removed files:   
/php-src/netwarepipe.c 
  Log:
  NetWare LibC has pipe/popen support
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard mail.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 05:22:22 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   mail.c 
  Log:
  NetWare LibC itself has a pip/popen support
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/mail.c?r1=1.82.2.1r2=1.82.2.2ty=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.82.2.1 
php-src/ext/standard/mail.c:1.82.2.2
--- php-src/ext/standard/mail.c:1.82.2.1Tue Aug  3 02:26:59 2004
+++ php-src/ext/standard/mail.c Wed Jun 29 05:22:20 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mail.c,v 1.82.2.1 2004/08/03 06:26:59 tony2001 Exp $ */
+/* $Id: mail.c,v 1.82.2.2 2005/06/29 09:22:20 hyanantha Exp $ */
 
 #include stdlib.h
 #include ctype.h
@@ -42,7 +42,6 @@
 #endif
 
 #ifdef NETWARE
-#include netware/pipe.h/* For popen(), pclose() */
 #include netware/sysexits.h   /* For exit status codes like EX_OK */
 #endif
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware pipe.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 06:17:04 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwarepipe.h 
  Log:
  NetWare LibC itself pipe/popen/pclose implementation
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware pipe.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 06:18:16 2005 EDT

  Removed files:   
/php-src/netwarepipe.h 
  Log:
  NetWare LibC itself has popen/pclose functionality so removing this
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware param.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 06:53:18 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwareparam.h 
  Log:
  NetWare LibC has param.h
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware param.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 06:53:48 2005 EDT

  Removed files:   
/php-src/netwareparam.h 
  Log:
  NetWare LibC has param.h
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware grp.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 07:03:54 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwaregrp.h 
  Log:
  NetWare LibC has grp.h
  
  


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware grp.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 07:04:25 2005 EDT

  Removed files:   
/php-src/netwaregrp.h 
  Log:
  NetWare LibC has grp.h
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware time_nw.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 07:21:28 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwaretime_nw.h 
  Log:
  This file does nothing so removing this file
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware wfile.c wfile.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 07:44:50 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwarewfile.h wfile.c 
  Log:
  NetWare LibC has readlink implementation
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware wfile.c wfile.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 07:49:17 2005 EDT

  Removed files:   
/php-src/netwarewfile.c wfile.h 
  Log:
  NetWare LibC has readlink implementation. This is not needed anymore.
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware pwd.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 08:04:04 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwarepwd.c 
  Log:
  NetWare LibC has getpwnam, getlogin, getpwuid, getpid, this file is not 
needed anymore
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware pwd.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 08:04:33 2005 EDT

  Removed files:   
/php-src/netwarepwd.c 
  Log:
  NetWare LibC has getpwnam, getlogin, getpwuid, getpid, this file is not 
needed anymore
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware mktemp.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 08:16:25 2005 EDT

  Removed files:   
/php-src/netwaremktemp.c 
  Log:
  Netware LibC has mktemp implementation
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware geterrnoptr.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 08:43:27 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netwaregeterrnoptr.c 
  Log:
  This file is not used at all.
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware geterrnoptr.c

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 08:44:07 2005 EDT

  Removed files:   
/php-src/netwaregeterrnoptr.c 
  Log:
  this file is not used at all so removing it.
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /netware/sys stat.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 09:09:48 2005 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/netware/sysstat.h 
  Log:
  this file is not needed anymore
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /netware/sys stat.h

2005-06-29 Thread Anantha Kesari H Y

hyanantha   Wed Jun 29 09:11:08 2005 EDT

  Removed files:   
/php-src/netware/sysstat.h 
  Log:
  This file is not needed anymore
  
  

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard lcg.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 08:48:31 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   lcg.c 
  Log:
  removing the redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/lcg.c?r1=1.38r2=1.38.2.1ty=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.38 php-src/ext/standard/lcg.c:1.38.2.1
--- php-src/ext/standard/lcg.c:1.38 Thu Jan  8 03:17:33 2004
+++ php-src/ext/standard/lcg.c  Tue Jun 28 08:48:28 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lcg.c,v 1.38 2004/01/08 08:17:33 andi Exp $ */
+/* $Id: lcg.c,v 1.38.2.1 2005/06/28 12:48:28 hyanantha Exp $ */
 
 #include php.h
 #include php_lcg.h
@@ -28,12 +28,8 @@
 #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
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/snmp snmp.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 09:43:30 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/snmp   snmp.c 
  Log:
  removing redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/ext/snmp/snmp.c?r1=1.92.2.10r2=1.92.2.11ty=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.92.2.10 php-src/ext/snmp/snmp.c:1.92.2.11
--- php-src/ext/snmp/snmp.c:1.92.2.10   Tue May 10 08:20:03 2005
+++ php-src/ext/snmp/snmp.c Tue Jun 28 09:43:29 2005
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.92.2.10 2005/05/10 12:20:03 sniper Exp $ */
+/* $Id: snmp.c,v 1.92.2.11 2005/06/28 13:43:29 hyanantha Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -40,19 +40,13 @@
 #include win32/time.h
 #elif defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
 #include sys/socket.h
 #endif
 #include errno.h
-/*#include process.h*/
-#ifdef NEW_LIBC
 #include sys/timeval.h
 #else
-#include netware/time_nw.h
-#endif
-#else
 #include sys/socket.h
 #include netinet/in.h
 #include arpa/inet.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard flock_compat.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 09:46:46 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   flock_compat.c 
  Log:
  removing redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/flock_compat.c?r1=1.27r2=1.27.2.1ty=u
Index: php-src/ext/standard/flock_compat.c
diff -u php-src/ext/standard/flock_compat.c:1.27 
php-src/ext/standard/flock_compat.c:1.27.2.1
--- php-src/ext/standard/flock_compat.c:1.27Thu Jan  8 03:17:31 2004
+++ php-src/ext/standard/flock_compat.c Tue Jun 28 09:46:45 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: flock_compat.c,v 1.27 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: flock_compat.c,v 1.27.2.1 2005/06/28 13:46:45 hyanantha Exp $ */
 
 #include php.h
 #include errno.h
@@ -33,11 +33,7 @@
 #endif
 
 #ifdef NETWARE
-#ifdef NEW_LIBC
 #include netinet/in.h
-#else
-#include sys/socket.h
-#endif
 #endif
 
 #ifndef HAVE_FLOCK

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard head.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 10:49:15 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   head.c 
  Log:
  removing redundant NEW_LIBC checks for NetWare
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/head.c?r1=1.75.2.1r2=1.75.2.2ty=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.75.2.1 
php-src/ext/standard/head.c:1.75.2.2
--- php-src/ext/standard/head.c:1.75.2.1Fri Jan  7 16:16:00 2005
+++ php-src/ext/standard/head.c Tue Jun 28 10:49:14 2005
@@ -15,14 +15,9 @@
| Author: Rasmus Lerdorf [EMAIL PROTECTED]|
+--+
  */
-/* $Id: head.c,v 1.75.2.1 2005/01/07 21:16:00 tony2001 Exp $ */
+/* $Id: head.c,v 1.75.2.2 2005/06/28 14:49:14 hyanantha Exp $ */
 
 #include stdio.h
-
-#if defined(NETWARE)  !defined(NEW_LIBC)
-#include sys/socket.h
-#endif
-
 #include php.h
 #include ext/standard/php_standard.h
 #include SAPI.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard fsock.h

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 10:57:31 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   fsock.h 
  Log:
  removing the redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/fsock.h?r1=1.47r2=1.47.2.1ty=u
Index: php-src/ext/standard/fsock.h
diff -u php-src/ext/standard/fsock.h:1.47 php-src/ext/standard/fsock.h:1.47.2.1
--- php-src/ext/standard/fsock.h:1.47   Thu Jan  8 12:32:51 2004
+++ php-src/ext/standard/fsock.hTue Jun 28 10:57:31 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: fsock.h,v 1.47 2004/01/08 17:32:51 sniper Exp $ */
+/* $Id: fsock.h,v 1.47.2.1 2005/06/28 14:57:31 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
@@ -26,11 +26,7 @@
 #define FSOCK_H
 
 #ifdef NETWARE
-#ifdef NEW_LIBC
-#include sys/timeval.h
-#else
-#include netware/time_nw.h/* For 'timeval' */
-#endif
+#include sys/timeval.h
 #endif
 
 #include file.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard filestat.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 11:14:22 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   filestat.c 
  Log:
  removing redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.130.2.2r2=1.130.2.3ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.130.2.2 
php-src/ext/standard/filestat.c:1.130.2.3
--- php-src/ext/standard/filestat.c:1.130.2.2   Fri Mar 11 06:20:24 2005
+++ php-src/ext/standard/filestat.c Tue Jun 28 11:14:22 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.130.2.2 2005/03/11 11:20:24 hyanantha Exp $ */
+/* $Id: filestat.c,v 1.130.2.3 2005/06/28 15:14:22 hyanantha Exp $ */
 
 #include php.h
 #include safe_mode.h
@@ -637,11 +637,7 @@
case FS_INODE:
RETURN_LONG((long)ssb.sb.st_ino);
case FS_SIZE:
-#if defined(NETWARE)  defined(NEW_LIBC)
-   RETURN_LONG((long)(stat_sb-st_size));
-#else
RETURN_LONG((long)ssb.sb.st_size);
-#endif
case FS_OWNER:
RETURN_LONG((long)ssb.sb.st_uid);
case FS_GROUP:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard microtime.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 11:19:35 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   microtime.c 
  Log:
  removing unwanted NetWare portion
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/microtime.c?r1=1.44.2.1r2=1.44.2.2ty=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.44.2.1 
php-src/ext/standard/microtime.c:1.44.2.2
--- php-src/ext/standard/microtime.c:1.44.2.1   Tue Mar  1 16:33:03 2005
+++ php-src/ext/standard/microtime.cTue Jun 28 11:19:35 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: microtime.c,v 1.44.2.1 2005/03/01 21:33:03 iliaa Exp $ */
+/* $Id: microtime.c,v 1.44.2.2 2005/06/28 15:19:35 hyanantha Exp $ */
 
 #include php.h
 
@@ -25,12 +25,6 @@
 #endif
 #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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard image.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 11:22:40 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   image.c 
  Log:
  removed the unwanted NetWare Code
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.9r2=1.98.2.10ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.9 
php-src/ext/standard/image.c:1.98.2.10
--- php-src/ext/standard/image.c:1.98.2.9   Wed Jun  1 18:28:38 2005
+++ php-src/ext/standard/image.cTue Jun 28 11:22:39 2005
@@ -17,13 +17,10 @@
+--+
  */
 
-/* $Id: image.c,v 1.98.2.9 2005/06/01 22:28:38 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.10 2005/06/28 15:22:39 hyanantha Exp $ */
 
 #include php.h
 #include stdio.h
-#if defined(NETWARE)  !defined(NEW_LIBC)
-#include sys/socket.h
-#endif
 #if HAVE_FCNTL_H
 #include fcntl.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main php_open_temporary_file.c

2005-06-28 Thread Anantha Kesari H Y

hyanantha   Tue Jun 28 11:27:50 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   php_open_temporary_file.c 
  Log:
  removed redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.30.2.2r2=1.30.2.3ty=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.30.2.2 
php-src/main/php_open_temporary_file.c:1.30.2.3
--- php-src/main/php_open_temporary_file.c:1.30.2.2 Fri May  6 12:49:04 2005
+++ php-src/main/php_open_temporary_file.c  Tue Jun 28 11:27:49 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.30.2.2 2005/05/06 16:49:04 tony2001 Exp 
$ */
+/* $Id: php_open_temporary_file.c,v 1.30.2.3 2005/06/28 15:27:49 hyanantha Exp 
$ */
 
 #include php.h
 
@@ -31,18 +31,12 @@
 #include win32/winutil.h
 #elif defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
 #include sys/socket.h
 #endif
-#ifdef NEW_LIBC
 #include sys/param.h
 #else
-#include netware/param.h
-#endif
-#include netware/mktemp.h
-#else
 #include sys/param.h
 #include sys/socket.h
 #include netinet/in.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main fopen_wrappers.c

2005-06-22 Thread Anantha Kesari H Y

hyanantha   Wed Jun 22 07:23:39 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   fopen_wrappers.c 
  Log:
  NetWare LibC has sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.170.2.2r2=1.170.2.3ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.170.2.2 
php-src/main/fopen_wrappers.c:1.170.2.3
--- php-src/main/fopen_wrappers.c:1.170.2.2 Fri Mar 11 01:55:22 2005
+++ php-src/main/fopen_wrappers.c   Wed Jun 22 07:23:35 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.170.2.2 2005/03/11 06:55:22 hyanantha Exp $ */
+/* $Id: fopen_wrappers.c,v 1.170.2.3 2005/06/22 11:23:35 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -35,14 +35,6 @@
 #ifdef PHP_WIN32
 #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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main main.c

2005-06-22 Thread Anantha Kesari H Y

hyanantha   Wed Jun 22 07:29:11 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   main.c 
  Log:
  removing the redundant NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.18r2=1.604.2.19ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.18 php-src/main/main.c:1.604.2.19
--- php-src/main/main.c:1.604.2.18  Mon Jun 20 15:59:21 2005
+++ php-src/main/main.c Wed Jun 22 07:29:07 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.604.2.18 2005/06/20 19:59:21 tony2001 Exp $ */
+/* $Id: main.c,v 1.604.2.19 2005/06/22 11:29:07 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -32,14 +32,7 @@
 #include win32/signal.h
 #include process.h
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include sys/timeval.h
-#else
-#include netware/time_nw.h
-#endif
-/*#include netware/signal_nw.h*/
-/*#include netware/env.h*//* Temporary */
-/*#include process.h*/
 #ifdef USE_WINSOCK
 #include novsock2.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard dl.c

2005-05-04 Thread Anantha Kesari H Y

hyanantha   Wed May  4 09:26:28 2005 EDT

  Modified files:  
/php-src/ext/standard   dl.c 
  Log:
  NetWare LibC dlsym works perfectly only thing that each of the extension need 
to export a symbol with FULL capital prefix.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.98r2=1.99ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.98 php-src/ext/standard/dl.c:1.99
--- php-src/ext/standard/dl.c:1.98  Mon Sep 27 10:51:17 2004
+++ php-src/ext/standard/dl.c   Wed May  4 09:26:28 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dl.c,v 1.98 2004/09/27 14:51:17 hyanantha Exp $ */
+/* $Id: dl.c,v 1.99 2005/05/04 13:26:28 hyanantha Exp $ */
 
 #include php.h
 #include dl.h
@@ -145,7 +145,6 @@
 
efree(libpath);
 
-#ifndef NETWARE
get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, 
get_module);
 
/*
@@ -156,23 +155,6 @@
 
if (!get_module)
get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, _get_module);
-#else
-   /* NetWare doesn't support two NLMs exporting same symbol */
-   {
-   char symbol_name[64] = \0;
-   int module_name_length = Z_STRLEN_P(file) - 4;  /* '.nlm' is 4 
characters; knock it off */
-
-   /* Take the module name (e.g.: 'php_ldap') and append 
'@get_module' to it */
-   strncpy(symbol_name, Z_STRVAL_P(file), module_name_length);
-   symbol_name[module_name_length] = '\0';
-   strcat(symbol_name, @);
-   strcat(symbol_name, get_module);
-
-   get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, symbol_name);
-   }
-   /* NetWare doesn't prepend '_' to symbol names; so the corresponding 
portion of code is also
-  not required for NetWare */
-#endif
 
if (!get_module) {
DL_UNLOAD(handle);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard dl.c

2005-05-04 Thread Anantha Kesari H Y

hyanantha   Wed May  4 09:48:02 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   dl.c 
  Log:
  NetWare LibC dlsym works perfectly only thing that each of the extension need 
to export a symbol with FULL capital prefix.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.96.2.2r2=1.96.2.3ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.96.2.2 php-src/ext/standard/dl.c:1.96.2.3
--- php-src/ext/standard/dl.c:1.96.2.2  Mon Mar 21 03:34:37 2005
+++ php-src/ext/standard/dl.c   Wed May  4 09:48:01 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dl.c,v 1.96.2.2 2005/03/21 08:34:37 hyanantha Exp $ */
+/* $Id: dl.c,v 1.96.2.3 2005/05/04 13:48:01 hyanantha Exp $ */
 
 #include php.h
 #include dl.h
@@ -142,7 +142,6 @@
 
efree(libpath);
 
-#ifndef NETWARE
get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, 
get_module);
 
/*
@@ -153,23 +152,6 @@
 
if (!get_module)
get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, _get_module);
-#else
-   /* NetWare doesn't support two NLMs exporting same symbol */
-   {
-   char symbol_name[64] = \0;
-   int module_name_length = Z_STRLEN_P(file) - 4;  /* '.nlm' is 4 
characters; knock it off */
-
-   /* Take the module name (e.g.: 'php_ldap') and append 
'@get_module' to it */
-   strncpy(symbol_name, Z_STRVAL_P(file), module_name_length);
-   symbol_name[module_name_length] = '\0';
-   strcat(symbol_name, @);
-   strcat(symbol_name, get_module);
-
-   get_module = (zend_module_entry *(*)(void)) 
DL_FETCH_SYMBOL(handle, symbol_name);
-   }
-   /* NetWare doesn't prepend '_' to symbol names; so the corresponding 
portion of code is also
-  not required for NetWare */
-#endif
 
if (!get_module) {
DL_UNLOAD(handle);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard dl.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:34:38 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   dl.c 
  Log:
  NetWare LibC headers have sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.96.2.1r2=1.96.2.2ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.96.2.1 php-src/ext/standard/dl.c:1.96.2.2
--- php-src/ext/standard/dl.c:1.96.2.1  Tue Jul 20 15:25:18 2004
+++ php-src/ext/standard/dl.c   Mon Mar 21 03:34:37 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dl.c,v 1.96.2.1 2004/07/20 19:25:18 helly Exp $ */
+/* $Id: dl.c,v 1.96.2.2 2005/03/21 08:34:37 hyanantha Exp $ */
 
 #include php.h
 #include dl.h
@@ -39,13 +39,6 @@
 #include win32/param.h
 #include win32/winutil.h
 #define GET_DL_ERROR() php_win_err()
-#elif defined(NETWARE)
-#ifdef NEW_LIBC
-#include sys/param.h
-#else
-#include netware/param.h
-#endif
-#define GET_DL_ERROR() dlerror()
 #else
 #include sys/param.h
 #define GET_DL_ERROR() DL_ERROR()

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard file.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:40:55 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   file.c 
  Log:
  NetWare LibC headers have sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.382.2.6r2=1.382.2.7ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.382.2.6 
php-src/ext/standard/file.c:1.382.2.7
--- php-src/ext/standard/file.c:1.382.2.6   Fri Mar 11 06:16:19 2005
+++ php-src/ext/standard/file.c Mon Mar 21 03:40:54 2005
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.382.2.6 2005/03/11 11:16:19 hyanantha Exp $ */
+/* $Id: file.c,v 1.382.2.7 2005/03/21 08:40:54 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -47,10 +47,6 @@
 #define O_RDONLY _O_RDONLY
 #include win32/param.h
 #include win32/winutil.h
-#elif defined(NETWARE)  !defined(NEW_LIBC)
-/*#include ws2nlm.h*/
-#include sys/socket.h
-#include netware/param.h
 #else
 #if HAVE_SYS_PARAM_H
 #include sys/param.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard ftp_fopen_wrapper.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:42:34 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  NetWare LibC headers have sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.74.2.3r2=1.74.2.4ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.74.2.3 
php-src/ext/standard/ftp_fopen_wrapper.c:1.74.2.4
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.74.2.3   Thu Mar 10 08:37:54 2005
+++ php-src/ext/standard/ftp_fopen_wrapper.cMon Mar 21 03:42:34 2005
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.74.2.3 2005/03/10 13:37:54 hyanantha Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.74.2.4 2005/03/21 08:42:34 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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard html.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:43:57 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   html.c 
  Log:
  NetWare can make use of configure generated php_config.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.7r2=1.97.2.8ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.97.2.7 
php-src/ext/standard/html.c:1.97.2.8
--- php-src/ext/standard/html.c:1.97.2.7Thu Mar 10 06:40:03 2005
+++ php-src/ext/standard/html.c Mon Mar 21 03:43:57 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: html.c,v 1.97.2.7 2005/03/10 11:40:03 jorton Exp $ */
+/* $Id: html.c,v 1.97.2.8 2005/03/21 08:43:57 hyanantha Exp $ */
 
 /*
  * HTML entity resources:
@@ -34,8 +34,6 @@
 #include php.h
 #if PHP_WIN32
 #include config.w32.h
-#elif defined NETWARE
-#include config.nw.h
 #else
 #include php_config.h
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard http_fopen_wrapper.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:46:50 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  NetWare LibC headers have sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.88r2=1.88.2.1ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.88 
php-src/ext/standard/http_fopen_wrapper.c:1.88.2.1
--- php-src/ext/standard/http_fopen_wrapper.c:1.88  Fri May 28 09:38:06 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Mon Mar 21 03:46:50 2005
@@ -18,7 +18,7 @@
|  Wez Furlong [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.88 2004/05/28 13:38:06 sesser Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.88.2.1 2005/03/21 08:46:50 hyanantha Exp $ */ 
 
 #include php.h
 #include php_globals.h
@@ -37,14 +37,6 @@
 #ifdef PHP_WIN32
 #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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard pack.c

2005-03-21 Thread Anantha Kesari H Y

hyanantha   Mon Mar 21 03:55:45 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   pack.c 
  Log:
  NetWare LibC headers have sys/param.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.52.2.2r2=1.52.2.3ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.52.2.2 
php-src/ext/standard/pack.c:1.52.2.3
--- php-src/ext/standard/pack.c:1.52.2.2Thu Mar 10 07:23:12 2005
+++ php-src/ext/standard/pack.c Mon Mar 21 03:55:43 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: pack.c,v 1.52.2.2 2005/03/10 12:23:12 hyanantha Exp $ */
+/* $Id: pack.c,v 1.52.2.3 2005/03/21 08:55:43 hyanantha Exp $ */
 
 #include php.h
 
@@ -30,17 +30,12 @@
 #include win32/param.h
 #elif defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
 #include sys/socket.h
 #endif
-#ifdef NEW_LIBC
 #include sys/param.h
 #else
-#include netware/param.h
-#endif
-#else
 #include sys/param.h
 #endif
 #include ext/standard/head.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main php.h

2005-03-14 Thread Anantha Kesari H Y

hyanantha   Mon Mar 14 04:41:45 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   php.h 
  Log:
  PHP_OS and PHP_UNAME for NetWare are getting populated from the 
ph_config.h(configure.in)
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203.2.8r2=1.203.2.9ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.203.2.8 php-src/main/php.h:1.203.2.9
--- php-src/main/php.h:1.203.2.8Thu Mar 10 06:32:36 2005
+++ php-src/main/php.h  Mon Mar 14 04:41:39 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.203.2.8 2005/03/10 11:32:36 hyanantha Exp $ */
+/* $Id: php.h,v 1.203.2.9 2005/03/14 09:41:39 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -65,16 +65,6 @@
 #endif
 #endif
 
-#ifdef NETWARE
-/* For php_get_uname() function */
-#define PHP_UNAME  NetWare
-/*
- * This is obtained using uname(2) on Unix and assigned in the case of Windows;
- * we'll do it this way at least for now.
- */
-#define PHP_OS  PHP_UNAME
-#endif
-
 #include php_regex.h
 
 #if HAVE_ASSERT_H

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main network.c

2005-03-11 Thread Anantha Kesari H Y

hyanantha   Fri Mar 11 03:11:29 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   network.c 
  Log:
  removed NetWare specific NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.109.2.2r2=1.109.2.3ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.109.2.2 php-src/main/network.c:1.109.2.3
--- php-src/main/network.c:1.109.2.2Tue Sep 28 05:13:37 2004
+++ php-src/main/network.c  Fri Mar 11 03:11:28 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.109.2.2 2004/09/28 09:13:37 wez Exp $ */
+/* $Id: network.c,v 1.109.2.3 2005/03/11 08:11:28 hyanantha Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -29,13 +29,9 @@
 #define O_RDONLY _O_RDONLY
 #include win32/param.h
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include sys/timeval.h
 #include sys/param.h
 #else
-#include netware/time_nw.h
-#endif
-#else
 #include sys/param.h
 #endif
 
@@ -57,15 +53,11 @@
 
 #if defined(NETWARE)
 #ifdef USE_WINSOCK
-/*#include ws2nlm.h*/
 #include novsock2.h
 #else
-/* New headers for socket stuff */
-#ifdef NEW_LIBC
 #include netinet/in.h
 #include netdb.h
 #include sys/select.h
-#endif
 #include sys/socket.h
 #endif
 #elif !defined(PHP_WIN32)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /main php_open_temporary_file.c

2005-03-11 Thread Anantha Kesari H Y

hyanantha   Fri Mar 11 03:18:15 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   php_open_temporary_file.c 
  Log:
  Netware LibC has mkstemp
  
  
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.30r2=1.30.2.1ty=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.30 
php-src/main/php_open_temporary_file.c:1.30.2.1
--- php-src/main/php_open_temporary_file.c:1.30 Mon Mar 29 16:44:07 2004
+++ php-src/main/php_open_temporary_file.c  Fri Mar 11 03:18:14 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.30 2004/03/29 21:44:07 wez Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.30.2.1 2005/03/11 08:18:14 hyanantha Exp 
$ */
 
 #include php.h
 
@@ -139,12 +139,6 @@
VCWD_CHMOD(opened_path, 0600);
fd = VCWD_OPEN_MODE(opened_path, open_flags, 0600);
}
-#elif defined(NETWARE)
-   /* Using standard mktemp() implementation for NetWare */
-   file_path = mktemp(opened_path);
-   if (file_path) {
-   fd = VCWD_OPEN(file_path, open_flags);
-   }
 #elif defined(HAVE_MKSTEMP)
fd = mkstemp(opened_path);
 #else

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard file.c

2005-03-11 Thread Anantha Kesari H Y

hyanantha   Fri Mar 11 06:16:23 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   file.c 
  Log:
  NetWare LibC has pwd.h and removing redundant CLIB_STAT_PATCH
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.382.2.5r2=1.382.2.6ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.382.2.5 
php-src/ext/standard/file.c:1.382.2.6
--- php-src/ext/standard/file.c:1.382.2.5   Sun Mar  6 19:17:51 2005
+++ php-src/ext/standard/file.c Fri Mar 11 06:16:19 2005
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.382.2.5 2005/03/07 00:17:51 helly Exp $ */
+/* $Id: file.c,v 1.382.2.6 2005/03/11 11:16:19 hyanantha Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -76,8 +76,6 @@
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include win32/pwd.h
-#elif defined(NETWARE)
-#include netware/pwd.h
 #else
 #include pwd.h
 #endif
@@ -1538,7 +1536,7 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); 
 #endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_ssb.sb.st_size);
-#if defined(NETWARE)  defined(CLIB_STAT_PATCH)
+#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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard filestat.c

2005-03-11 Thread Anantha Kesari H Y

hyanantha   Fri Mar 11 06:20:25 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   filestat.c 
  Log:
  removing redundant NEW_LIBC checks
  In NetWare statfs f_bavail member is known as f_bfree 
  NetWare LibC has pwd.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.130.2.1r2=1.130.2.2ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.130.2.1 
php-src/ext/standard/filestat.c:1.130.2.2
--- php-src/ext/standard/filestat.c:1.130.2.1   Thu Sep  2 05:44:59 2004
+++ php-src/ext/standard/filestat.c Fri Mar 11 06:20:24 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.130.2.1 2004/09/02 09:44:59 stas Exp $ */
+/* $Id: filestat.c,v 1.130.2.2 2005/03/11 11:20:24 hyanantha Exp $ */
 
 #include php.h
 #include safe_mode.h
@@ -58,8 +58,6 @@
 #if HAVE_PWD_H
 # ifdef PHP_WIN32
 #  include win32/pwd.h
-# elif defined(NETWARE)
-#  include netware/pwd.h
 # else
 #  include pwd.h
 # endif
@@ -313,8 +311,12 @@
}
 #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H))  
defined(HAVE_STATFS)
if (statfs(Z_STRVAL_PP(path), buf)) RETURN_FALSE;
+#ifdef NETWARE
+   bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bfree));
+#else
bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail));
 #endif
+#endif
 #endif /* WINDOWS */
 
RETURN_DOUBLE(bytesfree);
@@ -645,19 +647,19 @@
case FS_GROUP:
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
-#if defined(NETWARE)  defined(NEW_LIBC)
+#ifdef NETWARE
RETURN_LONG((long)((stat_sb-st_atime).tv_sec));
 #else
RETURN_LONG((long)ssb.sb.st_atime);
 #endif
case FS_MTIME:
-#if defined(NETWARE)  defined(NEW_LIBC)
+#ifdef NETWARE
RETURN_LONG((long)((stat_sb-st_mtime).tv_sec));
 #else
RETURN_LONG((long)ssb.sb.st_mtime);
 #endif
case FS_CTIME:
-#if defined(NETWARE)  defined(NEW_LIBC)
+#ifdef NETWARE
RETURN_LONG((long)((stat_sb-st_ctime).tv_sec));
 #else
RETURN_LONG((long)ssb.sb.st_ctime);
@@ -709,7 +711,7 @@
MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); 
 #endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb-st_size);
-#if defined(NETWARE)  defined(NEW_LIBC)
+#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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

1 2 3 >

1 - 100 of 265 matches

Mail list logo