From 24ef5b3bfc7b2c71780a8edd0fefa9f75eac5950 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Sat, 24 Nov 2001 20:18:37 +0000
Subject: [PATCH] socklen_t compatibility cruft.

---
 Makefile                  | 6 ++++--
 socket/socket_accept4.c   | 3 ++-
 socket/socket_accept6.c   | 3 ++-
 socket/socket_connected.c | 4 ----
 socket/socket_local4.c    | 3 ++-
 socket/socket_local6.c    | 3 ++-
 socket/socket_recv4.c     | 3 ++-
 socket/socket_recv6.c     | 3 ++-
 socket/socket_remote4.c   | 3 ++-
 socket/socket_remote6.c   | 3 ++-
 10 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index c864c64..065e41b 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ haven2i.h:
 
 havesl.h:
 	-rm -f $@
-	if $(DIET) $(CC) -o t trysl.c >/dev/null 2>&1; then echo "#define HAVE_SOCKLEN_T"; fi > $@
+	if ! $(DIET) $(CC) -o t trysl.c >/dev/null 2>&1; then echo "typedef int socklen_t;"; fi > $@
 	-rm -f t
 
 haveinline.h:
@@ -108,6 +108,8 @@ socket_remote6.o socket_send6.o socket_tcp6.o socket_udp6.o: haveip6.h
 
 socket_getifidx.o socket_getifname.o: haven2i.h
 
-socket_connected.o: havesl.h
+socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \
+socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
+socket_remote6.o: havesl.h
 
 fmt_xlong.o scan_xlong.o fmt_ip6_flat.o: haveinline.h
diff --git a/socket/socket_accept4.c b/socket/socket_accept4.c
index b59625f..c9c323f 100644
--- a/socket/socket_accept4.c
+++ b/socket/socket_accept4.c
@@ -2,10 +2,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include "socket.h"
+#include "havesl.h"
 
 int socket_accept4(int s,char *ip,uint16 *port) {
   struct sockaddr_in si;
-  unsigned int len = sizeof si;
+  socklen_t len = sizeof si;
   int fd;
   if ((fd=accept(s,(struct sockaddr*) &si,&len))<0) return -1;
   *(uint32*)ip = *(uint32*)&si.sin_addr;
diff --git a/socket/socket_accept6.c b/socket/socket_accept6.c
index d2f7258..e4bd1e0 100644
--- a/socket/socket_accept6.c
+++ b/socket/socket_accept6.c
@@ -6,6 +6,7 @@
 #include "socket.h"
 #include "ip6.h"
 #include "haveip6.h"
+#include "havesl.h"
 
 int socket_accept6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 {
@@ -14,7 +15,7 @@ int socket_accept6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 #else
   struct sockaddr_in sa;
 #endif
-  unsigned int dummy = sizeof sa;
+  socklen_t dummy = sizeof sa;
   int fd;
 
   fd = accept(s,(struct sockaddr *) &sa,&dummy);
diff --git a/socket/socket_connected.c b/socket/socket_connected.c
index 2b10d1c..e4f8b7f 100644
--- a/socket/socket_connected.c
+++ b/socket/socket_connected.c
@@ -6,11 +6,7 @@
 
 int socket_connected(int s) {
   struct sockaddr si;
-#ifdef HAVE_SOCKLEN_T
   socklen_t sl=sizeof si;
-#else
-  int sl=sizeof si;
-#endif
   if (getpeername(s,&si,&sl))
     return 0;
   return 1;
diff --git a/socket/socket_local4.c b/socket/socket_local4.c
index 0a82496..e36cfcb 100644
--- a/socket/socket_local4.c
+++ b/socket/socket_local4.c
@@ -4,11 +4,12 @@
 #include <netinet/in.h>
 #include "byte.h"
 #include "socket.h"
+#include "havesl.h"
 
 int socket_local4(int s,char ip[4],uint16 *port)
 {
   struct sockaddr_in si;
-  unsigned int len = sizeof si;
+  socklen_t len = sizeof si;
 
   if (getsockname(s,(struct sockaddr *) &si,&len) == -1) return -1;
   *(uint32*)ip = *(uint32*)&si.sin_addr;
diff --git a/socket/socket_local6.c b/socket/socket_local6.c
index e0de221..1a72477 100644
--- a/socket/socket_local6.c
+++ b/socket/socket_local6.c
@@ -7,6 +7,7 @@
 #include "ip6.h"
 #include "haveip6.h"
 #include "uint32.h"
+#include "havesl.h"
 
 int socket_local6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 {
@@ -15,7 +16,7 @@ int socket_local6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 #else
   struct sockaddr_in si;
 #endif
-  unsigned int len = sizeof si;
+  socklen_t len = sizeof si;
 
   if (getsockname(s,(struct sockaddr *) &si,&len) == -1) return -1;
 #ifdef LIBC_HAS_IP6
diff --git a/socket/socket_recv4.c b/socket/socket_recv4.c
index 5f0b788..61b45d7 100644
--- a/socket/socket_recv4.c
+++ b/socket/socket_recv4.c
@@ -3,10 +3,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include "socket.h"
+#include "havesl.h"
 
 int socket_recv4(int s,char *buf,unsigned int len,char ip[4],uint16 *port) {
   struct sockaddr_in si;
-  unsigned int Len = sizeof si;
+  socklen_t Len = sizeof si;
   int r;
 
   if ((r = recvfrom(s,buf,len,0,(struct sockaddr *) &si,&Len))<0) return -1;
diff --git a/socket/socket_recv6.c b/socket/socket_recv6.c
index 826939c..7372246 100644
--- a/socket/socket_recv6.c
+++ b/socket/socket_recv6.c
@@ -6,6 +6,7 @@
 #include "socket.h"
 #include "ip6.h"
 #include "haveip6.h"
+#include "havesl.h"
 
 int socket_recv6(int s,char *buf,unsigned int len,char ip[16],uint16 *port,uint32 *scope_id)
 {
@@ -14,7 +15,7 @@ int socket_recv6(int s,char *buf,unsigned int len,char ip[16],uint16 *port,uint3
 #else
   struct sockaddr_in si;
 #endif
-  unsigned int Len = sizeof si;
+  socklen_t Len = sizeof si;
   int r;
 
   byte_zero(&si,Len);
diff --git a/socket/socket_remote4.c b/socket/socket_remote4.c
index b3c99c8..d8be55b 100644
--- a/socket/socket_remote4.c
+++ b/socket/socket_remote4.c
@@ -4,11 +4,12 @@
 #include <netinet/in.h>
 #include "byte.h"
 #include "socket.h"
+#include "havesl.h"
 
 int socket_remote4(int s,char ip[4],uint16 *port)
 {
   struct sockaddr_in si;
-  unsigned int len = sizeof si;
+  socklen_t len = sizeof si;
 
   if (getpeername(s,(struct sockaddr *) &si,&len) == -1) return -1;
   *(uint32*)ip = *(uint32*)&si.sin_addr;
diff --git a/socket/socket_remote6.c b/socket/socket_remote6.c
index f8c16e1..5b0e514 100644
--- a/socket/socket_remote6.c
+++ b/socket/socket_remote6.c
@@ -7,6 +7,7 @@
 #include "ip6.h"
 #include "haveip6.h"
 #include "uint32.h"
+#include "havesl.h"
 
 int socket_remote6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 {
@@ -15,7 +16,7 @@ int socket_remote6(int s,char ip[16],uint16 *port,uint32 *scope_id)
 #else
   struct sockaddr_in si;
 #endif
-  unsigned int len = sizeof si;
+  socklen_t len = sizeof si;
 
   if (getpeername(s,(struct sockaddr *) &si,&len) == -1) return -1;
 #ifdef LIBC_HAS_IP6