OSSP CVS Repository

ossp - Check-in [3464]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 3464
Date: 2003-Jun-30 12:36:52 (local)
2003-Jun-30 10:36:52 (UTC)
User:rse
Branch:
Comment: *) Correctly check the "status" return value of waitpid(3) in the test suite.

*) Change in the test suite "%08lx" format string to "%d" because the ts library only has a minimal formatting engine and the argument is "int" and not "long" anyway.

*) Make sure that sio_{bio,sa,zlib}.c are not empty compilation units (not allowed in ISO C) even if BIO, SA or ZLIB support is not activated.

*) Changed SIZE_T_MAX fallback definition to a more portable variant based on sizeof(size_t) instead of relying on the existance of (non portable) UINT_MAX.

*) Added GNU autoconf checks for libnsl/libsocket under Solaris.

*) Upgraded to GNU libtool 1.5

Tickets:
Inspections:
Files:
ossp-pkg/al/devtool.conf      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/sa/devtool.conf      1.17 -> 1.18     1 inserted, 1 deleted
ossp-pkg/sio/ChangeLog      1.3 -> 1.4     36 inserted, 1 deleted
ossp-pkg/sio/README      1.3 -> 1.4     1 inserted, 1 deleted
ossp-pkg/sio/VERSION      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/sio/devtool.conf      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/sio/sio.ac      1.3 -> 1.4     6 inserted, 0 deleted
ossp-pkg/sio/sio_bio.c      1.12 -> 1.13     5 inserted, 0 deleted
ossp-pkg/sio/sio_sa.c      1.9 -> 1.10     4 inserted, 0 deleted
ossp-pkg/sio/sio_sio.c      1.4 -> 1.5     4 inserted, 3 deleted
ossp-pkg/sio/sio_test.c      1.18 -> 1.19     22 inserted, 6 deleted
ossp-pkg/sio/sio_zlib.c      1.8 -> 1.9     4 inserted, 0 deleted
ossp-pkg/al/devtool.conf 1.6 -> 1.7 

--- devtool.conf 2003/01/06 13:49:25     1.6
+++ devtool.conf 2003/06/30 10:36:53     1.7
@@ -4,7 +4,7 @@
 
 %autogen
     @autogen shtool   1.6.2 "1.6.*" all
-    @autogen libtool  1.4.3 "1.4*"
+    @autogen libtool  1.5   "1.5*"
     @autogen autoconf 2.57  "2.5[3-9]*"
 
 %autoclean

ossp-pkg/sa/devtool.conf 1.17 -> 1.18 

--- devtool.conf 2003/01/06 13:11:23     1.17
+++ devtool.conf 2003/06/30 10:36:53     1.18
@@ -4,7 +4,7 @@
 
 %autogen
     @autogen shtool   1.6.2 "1.6.*" all
-    @autogen libtool  1.4.3 "1.4*"
+    @autogen libtool  1.5   "1.5*"
     @autogen autoconf 2.57  "2.5[3-9]*"
 
 %autoclean

ossp-pkg/sio/ChangeLog 1.3 -> 1.4 

--- ChangeLog    2003/02/06 14:45:37     1.3
+++ ChangeLog    2003/06/30 10:36:52     1.4
@@ -11,5 +11,40 @@
   This is a list of all changes to OSSP sio.
   For a more brief summary please have a look at the NEWS file.
 
-  Initial release 0.9.0 (06-Feb-2003)
+  Changes between 0.9.1 and 0.9.2 (17-Jun-2003 to 30-Jun-2003)
+
+   *) Correctly check the "status" return value of waitpid(3)
+      in the test suite.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+   *) Change in the test suite "%08lx" format string to "%d" because the
+      ts library only has a minimal formatting engine and the argument
+      is "int" and not "long" anyway.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+   *) Make sure that sio_{bio,sa,zlib}.c are not empty compilation
+      units (not allowed in ISO C) even if BIO, SA or ZLIB support is not
+      activated.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+   *) Changed SIZE_T_MAX fallback definition to a more portable variant
+      based on sizeof(size_t) instead of relying on the existance of
+      (non portable) UINT_MAX.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+   *) Added GNU autoconf checks for libnsl/libsocket under Solaris.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+   *) Upgraded to GNU libtool 1.5
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
+  Changes between 0.9.0 and 0.9.1 (06-Feb-2003 to 17-Jun-2003)
+
+   *) Support systems that do not define SIZE_T_MAX
+      [Michael van Elst <mlelstv@dev.de.cw.net>]
+
+  Changes between *GENESIS* and 0.9.0 (06-Feb-2003)
+    
+   *) Initial Release
+      [Michael van Elst <mlelstv@dev.de.cw.net>]

ossp-pkg/sio/README 1.3 -> 1.4 

--- README       2003/02/06 13:20:42     1.3
+++ README       2003/06/30 10:36:52     1.4
@@ -5,7 +5,7 @@
   |_|_|_|  \___/|____/____/|_|     |___/_|\___/
 
   OSSP sio - Stream I/O
-  Version 0.9.0 (06-Feb-2003)
+  Version 0.9.2 (30-Jun-2003)
 
   ABSTRACT

ossp-pkg/sio/VERSION 1.2 -> 1.3 

--- VERSION      2003/02/06 13:44:35     1.2
+++ VERSION      2003/06/30 10:36:52     1.3
@@ -2,5 +2,5 @@
   VERSION -- Version Information for OSSP sio (syntax: Text)
   [automatically generated and maintained by GNU shtool]
 
-  This is OSSP sio, Version 0.9.0 (06-Feb-2003)
+  This is OSSP sio, Version 0.9.2 (30-Jun-2003)

ossp-pkg/sio/devtool.conf 1.6 -> 1.7 

--- devtool.conf 2003/02/06 14:36:19     1.6
+++ devtool.conf 2003/06/30 10:36:52     1.7
@@ -11,7 +11,7 @@
 
 %autogen
     @autogen shtool   1.6.2 "1.6.*" all
-    @autogen libtool  1.4.3 "1.4*"
+    @autogen libtool  1.5   "1.5*"
     @autogen autoconf 2.57  "2.5[3-9]*"
 
     for name in al sa; do

ossp-pkg/sio/sio.ac 1.3 -> 1.4 

--- sio.ac       2003/02/06 14:21:38     1.3
+++ sio.ac       2003/06/30 10:36:52     1.4
@@ -35,6 +35,12 @@
 dnl #     SIO_CHECK_ALL
 
 AC_DEFUN(SIO_CHECK_ALL,[
+dnl #   make sure libnsl and libsocket are linked in if they exist
+AC_CHECK_LIB(nsl, gethostname)
+if test ".`echo $LIBS | grep nsl`" = .; then
+    AC_CHECK_LIB(nsl, gethostbyname)
+fi
+AC_CHECK_LIB(socket, accept)
 
 dnl #   built-time configuration parameter --enable-bio
 AC_MSG_CHECKING(for BIO support)

ossp-pkg/sio/sio_bio.c 1.12 -> 1.13 

--- sio_bio.c    2003/02/06 12:45:18     1.12
+++ sio_bio.c    2003/06/30 10:36:52     1.13
@@ -641,4 +641,9 @@
     siobio_shutdown
 };
 
+#else
+
+const char __sio_bio_c[] = "";
+
 #endif /* ENABLE_BIO */
+

ossp-pkg/sio/sio_sa.c 1.9 -> 1.10 

--- sio_sa.c     2003/02/09 21:39:17     1.9
+++ sio_sa.c     2003/06/30 10:36:52     1.10
@@ -261,4 +261,8 @@
     NULL
 };
 
+#else
+
+const char __sio_sa_c[] = "";
+
 #endif /* ENABLE_SA */

ossp-pkg/sio/sio_sio.c 1.4 -> 1.5 

--- sio_sio.c    2003/06/17 14:01:23     1.4
+++ sio_sio.c    2003/06/30 10:36:52     1.5
@@ -32,13 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX UINT_MAX
-#endif
 
 #include "al.h"
 #include "sio.h"
 
+#ifndef SIZE_T_MAX
+#define SIZE_T_MAX (((((size_t)1 << ((sizeof(size_t) * 8) - 1)) - 1) << 1) + 1)
+#endif
+
 typedef struct {
     sio_t      *upstream;
     al_label_t  my_data_label;

ossp-pkg/sio/sio_test.c 1.18 -> 1.19 

--- sio_test.c   2003/02/11 10:54:07     1.18
+++ sio_test.c   2003/06/30 10:36:52     1.19
@@ -153,9 +153,17 @@
         (*client)(_t, pd[0], wcount);
         close(pd[0]);
         waitpid(child, &status, 0);
-        if (status != 0) {
-            ts_test_fail(TS_CTX, "child returned status %08lx\n",
-                status);
+        if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
+            ts_test_fail(TS_CTX, "child terminated through exit with return code %d\n",
+                WEXITSTATUS(status));
+        }
+        else if (WIFSIGNALED(status)) {
+            ts_test_fail(TS_CTX, "child terminated through signal %d%s\n",
+                WTERMSIG(status), WCOREDUMP(status) ? " (core dump written)" : "");
+        }
+        else if (WIFSTOPPED(status)) {
+            ts_test_fail(TS_CTX, "child stopped through signal %d%s\n",
+                WSTOPSIG(status));
         }
     }
 }
@@ -1137,9 +1145,17 @@
         test_sio_sa_read(_t, sa_client, wcount);
         rc = sa_shutdown(sa_server, "r");
         waitpid(child, &status, 0);
-        if (status != 0) {
-            ts_test_fail(TS_CTX, "child returned status %08lx\n",
-                status);
+        if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
+            ts_test_fail(TS_CTX, "child terminated through exit with return code %d\n",
+                WEXITSTATUS(status));
+        }
+        else if (WIFSIGNALED(status)) {
+            ts_test_fail(TS_CTX, "child terminated through signal %d%s\n",
+                WTERMSIG(status), WCOREDUMP(status) ? " (core dump written)" : "");
+        }
+        else if (WIFSTOPPED(status)) {
+            ts_test_fail(TS_CTX, "child stopped through signal %d%s\n",
+                WSTOPSIG(status));
         }
     }

ossp-pkg/sio/sio_zlib.c 1.8 -> 1.9 

--- sio_zlib.c   2003/02/03 17:18:46     1.8
+++ sio_zlib.c   2003/06/30 10:36:52     1.9
@@ -378,4 +378,8 @@
     NULL
 };
 
+#else
+
+const char __sio_zlib_c[] = "";
+
 #endif /* ENABLE_ZLIB */

CVSTrac 2.0.1