Fix errno.

4 files changed, 44 insertions, 24 deletions

diff --git a/sysutils/socket/distinfo b/sysutils/socket/distinfo
index 100fe19836e..bcfa7e253d7 100644
--- a/sysutils/socket/distinfo
+++ b/sysutils/socket/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/10/04 16:12:28 tron Exp $
+$NetBSD: distinfo,v 1.8 2006/01/25 02:12:10 joerg Exp $
 
 SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
 RMD160 (socket-1.1.tar.gz) = 9a697cbdc807223f48229caa3349cba216b5ffc0
 Size (socket-1.1.tar.gz) = 14426 bytes
 SHA1 (patch-aa) = 83b6f15cc92b6bfbed03ea5d91b56cb329957241
 SHA1 (patch-ab) = a57ef3243601007113f07493201804a6050f3182
-SHA1 (patch-ac) = 8fd665125b26aadc16ddbebcd165b2759391234b
+SHA1 (patch-ac) = 73d6cabae5eec437edf39ee1cbb8ceea8cbb9f1e
 SHA1 (patch-ad) = 034f34565952f94b4e12cf78f0bb9b5612091e4d
 SHA1 (patch-ae) = 97bbe5066b8bf00fe45df1c1088768400abf102e
 SHA1 (patch-af) = b40a7bbd22a6773816eb0e52403d67317979451d
 SHA1 (patch-ag) = e106aac5b193a43ab208b648deadf173a78a6d6d
-SHA1 (patch-ah) = 03a996a5d1a40cf573882b842d94d24b226f74ca
-SHA1 (patch-ai) = d91f586ff0e109b1b453671550e20c6f80fd9778
+SHA1 (patch-ah) = 232f359d1c6256266d1dff9c98891ce591ebc13b
+SHA1 (patch-ai) = 855c15e6b25ec96e740933be0310366afbce4ec8
diff --git a/sysutils/socket/patches/patch-ac b/sysutils/socket/patches/patch-ac
index d96d8a00a3a..12aec667423 100644
--- a/sysutils/socket/patches/patch-ac
+++ b/sysutils/socket/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/08/06 21:22:24 tron Exp $
+$NetBSD: patch-ac,v 1.5 2006/01/25 02:12:10 joerg Exp $
 
---- globals.h.orig	1992-08-30 20:04:27.000000000 +0100
-+++ globals.h	2005-08-06 22:21:30.000000000 +0100
-@@ -8,6 +8,12 @@
+--- globals.h.orig	1992-08-30 19:04:27.000000000 +0000
++++ globals.h
+@@ -8,6 +8,12 @@ Please read the file COPYRIGHT for furth
  */
  
  #include "patchlevel.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.4 2005/08/06 21:22:24 tron Exp $
  
  /* globals for socket */
  
-@@ -22,9 +28,16 @@
+@@ -22,9 +28,16 @@ Please read the file COPYRIGHT for furth
  #define A(args) ()
  #endif
  
@@ -32,7 +32,16 @@ $NetBSD: patch-ac,v 1.4 2005/08/06 21:22:24 tron Exp $
  void catchsig A((int sig)) ;
  void usage A((void)) ;
  int do_read_write A((int from, int to)) ;
-@@ -49,4 +62,7 @@
+@@ -37,8 +50,6 @@ void add_crs A((char *from, char *to, in
+ void strip_crs A((char *from, char *to, int *sizep)) ;
+ void background A((void)) ;
+ 
+-extern int errno ;
+-
+ /* global variables */
+ extern int serverflag ;
+ extern int loopflag ;
+@@ -49,4 +60,7 @@ extern int quitflag ;
  extern int crlfflag ;
  extern int active_socket ;
  extern char *progname ;
diff --git a/sysutils/socket/patches/patch-ah b/sysutils/socket/patches/patch-ah
index 3ed55d76784..8c496e1d9d6 100644
--- a/sysutils/socket/patches/patch-ah
+++ b/sysutils/socket/patches/patch-ah
@@ -1,10 +1,13 @@
-$NetBSD: patch-ah,v 1.2 1999/09/17 18:23:56 tron Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/25 02:12:10 joerg Exp $
 
---- socketp.c.orig	Thu Sep 16 13:52:58 1999
-+++ socketp.c	Thu Sep 16 13:26:38 1999
-@@ -11,10 +11,17 @@
+--- socketp.c.orig	1992-08-09 01:41:42.000000000 +0000
++++ socketp.c
+@@ -9,12 +9,19 @@ Please read the file COPYRIGHT for furth
+ 
+ #include <sys/types.h>
  #include <sys/socket.h>
- #include <sys/errno.h>
+-#include <sys/errno.h>
++#include <errno.h>
  #include <netinet/in.h>
 +#include <arpa/inet.h>
  #include <netdb.h>
@@ -20,7 +23,7 @@ $NetBSD: patch-ah,v 1.2 1999/09/17 18:23:56 tron Exp $
  /*
   * create a server socket on PORT accepting QUEUE_LENGTH connections
   */
-@@ -25,9 +32,9 @@
+@@ -25,9 +32,9 @@ int queue_length ;
      struct sockaddr_in sa ;
      int s;
  
@@ -32,7 +35,7 @@ $NetBSD: patch-ah,v 1.2 1999/09/17 18:23:56 tron Exp $
  
      bzero((char *) &sa, sizeof(sa)) ;
      sa.sin_family = AF_INET ;
-@@ -35,54 +42,270 @@
+@@ -35,54 +42,270 @@ int queue_length ;
      sa.sin_port = htons(port) ;
  
      if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
@@ -320,7 +323,7 @@ $NetBSD: patch-ah,v 1.2 1999/09/17 18:23:56 tron Exp $
  /* return the port number for service NAME_OR_NUMBER. If NAME is non-null,
   * the name is the service is written there.
   */
-@@ -116,5 +339,6 @@
+@@ -116,5 +339,6 @@ char **name ;
  	return ntohs(servent->s_port) ;
      }
  }
diff --git a/sysutils/socket/patches/patch-ai b/sysutils/socket/patches/patch-ai
index 6ef53251861..18de0c80336 100644
--- a/sysutils/socket/patches/patch-ai
+++ b/sysutils/socket/patches/patch-ai
@@ -1,8 +1,16 @@
-$NetBSD: patch-ai,v 1.2 2005/10/04 16:12:28 tron Exp $
+$NetBSD: patch-ai,v 1.3 2006/01/25 02:12:10 joerg Exp $
 
---- utils.c.orig	1992-09-09 15:31:16.000000000 +0100
-+++ utils.c	2005-10-04 17:09:34.000000000 +0100
-@@ -25,8 +25,10 @@
+--- utils.c.orig	1992-09-09 14:31:16.000000000 +0000
++++ utils.c
+@@ -18,6 +18,7 @@ Please read the file COPYRIGHT for furth
+ #include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
++#include <errno.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #ifdef ISC
+@@ -25,8 +26,10 @@ Please read the file COPYRIGHT for furth
  #else
  #include <sys/resource.h>
  #endif
@@ -13,7 +21,7 @@ $NetBSD: patch-ai,v 1.2 2005/10/04 16:12:28 tron Exp $
  
  /* Signal handler, print message and exit */
  SIG_HANDLER_RET exitsig(sig)
-@@ -70,10 +72,10 @@
+@@ -70,10 +73,10 @@ char *s ;
  
  /* set up signal handling. All except TSTP, CONT, CLD, and QUIT
   * are caught with exitsig(). */
@@ -26,7 +34,7 @@ $NetBSD: patch-ai,v 1.2 2005/10/04 16:12:28 tron Exp $
      static struct sigvec svec = { exitsig, ~0, 0 } ;
  #endif
  
-@@ -103,7 +105,7 @@
+@@ -103,7 +106,7 @@ init_signals()
  	  case SIGQUIT:		/* if the user wants a core dump, */
  	    continue ;		/* they can have it. */
  	  default: