From 1942c5fd5456b62a646d3295be84e903cd111ee5 Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Mon, 3 Feb 2003 23:33:33 +0000
Subject: [PATCH] STABLE12-lwp-tests-20030203

FIXES 1280

make the tests work


(cherry picked from commit f15e1e3f8f6d50ca931f2853bf9a166cddaa4c81)
---
 src/lwp/test/selclient.c | 7 ++++++-
 src/lwp/test/selserver.c | 2 +-
 src/lwp/test/selsubs.c   | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lwp/test/selclient.c b/src/lwp/test/selclient.c
index 10a8dbe4e..888f4065a 100644
--- a/src/lwp/test/selclient.c
+++ b/src/lwp/test/selclient.c
@@ -41,7 +41,7 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <bstring.h>
+#include <string.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -184,6 +184,11 @@ main(int ac, char **av)
 	Usage();
     }
 
+    if (writeSize == 0 && doEnd ==0 && putOOB == 0) {
+	printf("%s: Missing action.\n", program);
+	Usage();
+    }
+
     if (!setFD) {
 	setFD = 31;
 	printf("%s: Using default socket of %d.\n", program, setFD);
diff --git a/src/lwp/test/selserver.c b/src/lwp/test/selserver.c
index ec500df36..910fe4017 100644
--- a/src/lwp/test/selserver.c
+++ b/src/lwp/test/selserver.c
@@ -42,7 +42,7 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <bstring.h>
+#include <string.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/src/lwp/test/selsubs.c b/src/lwp/test/selsubs.c
index d30a9de14..a76261c25 100644
--- a/src/lwp/test/selsubs.c
+++ b/src/lwp/test/selsubs.c
@@ -16,7 +16,7 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <bstring.h>
+#include <string.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -141,12 +141,13 @@ void Log(char *fmt, ...)
 {
     va_list args;
     struct timeval now;
+    struct timezone tz;
     struct tm *ltime;
     int code;
     PROCESS pid;
     extern char *program;
     
-    code = gettimeofday(&now);
+    code = gettimeofday(&now,&tz);
     assert (code == 0);
 
     ltime = localtime((time_t*)&now.tv_sec);
-- 
2.39.5