[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-73-g982ff0e

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  982ff0eeab04235b193b312ea6433993296db515 (commit)
      from  8f92df2bd52bcbddf8841e3b79d779109d485e5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=982ff0eeab04235b193b312ea6433993296db515


commit 982ff0eeab04235b193b312ea6433993296db515
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Apr 11 22:08:09 2012 +0200

    Portability fixes and cleanup.
    
    Support DragonFly BSD and fix a resilient
    issue on OpenSolaris.

diff --git a/ChangeLog b/ChangeLog
index 7bdd098..09c71c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-11  Mats Erik Andersson  <address@hidden>
+
+       Support for DragonFly BSD.
+
+       * configure.ac: Define UTMPX for `*dragonfly*'.
+       * ftpd/extern.h: Include <sys/socket.h>.
+       * src/rexec.c (do_rexec): Explicit casts as `struct sockaddr'.
+       * src/tftpd.c (validate_access): Declare TIMEOUTBUF correctly
+       to be of type `sigjmp_buf'.
+       * telnet/externs.h: Include <errno.h> unconditionally.  Remove
+       conditionals for `errno' depending on macro CRAY.
+
 2012-03-31  Alfred M. Szmidt  <address@hidden>
 
        configure.ac: Minor cleanup.
diff --git a/configure.ac b/configure.ac
index 47e8133..6b474c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,7 +832,7 @@ case "$host" in
   AC_DEFINE([UTMPX], 1, [FIXME])
   AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
-*irix* | *hpux* | *netbsd*)
+*irix* | *hpux* | *netbsd* | *dragonfly* )
   AC_DEFINE([UTMPX], 1, [FIXME])
   ;;
 esac
diff --git a/ftpd/extern.h b/ftpd/extern.h
index 422bd99..acf673f 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -51,6 +51,7 @@
 #include <setjmp.h>
 #include <getopt.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 
 extern void cwd (const char *);
diff --git a/src/rexec.c b/src/rexec.c
index 3cce369..57d6aee 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -206,7 +206,7 @@ do_rexec (struct arguments *arguments)
 
   addr.sin_port = htons ((short)arguments->port);
 
-  if (connect (sock, &addr, sizeof (addr)) < 0)
+  if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
     error (EXIT_FAILURE, errno, "cannot connect to the specified host");
 
   if (!arguments->use_err)
@@ -228,11 +228,12 @@ do_rexec (struct arguments *arguments)
       memset (&serv_addr, 0, sizeof (serv_addr));
 
       serv_addr.sin_port = arguments->err_port;
-      if (bind (serv_sock, &serv_addr, sizeof (serv_addr)) < 0)
+      if (bind (serv_sock, (struct sockaddr *) &serv_addr,
+               sizeof (serv_addr)) < 0)
         error (EXIT_FAILURE, errno, "cannot bind socket");
 
       len = sizeof (serv_addr);
-      if (getsockname (serv_sock, &serv_addr, &len))
+      if (getsockname (serv_sock, (struct sockaddr *) &serv_addr, &len))
         error (EXIT_FAILURE, errno, "error reading socket port");
 
       if (listen (serv_sock, 1))
@@ -242,7 +243,7 @@ do_rexec (struct arguments *arguments)
       sprintf (port_str, "%i", arguments->err_port);
       safe_write (sock, port_str, strlen (port_str) + 1);
 
-      err_sock = accept (serv_sock, &serv_addr, &len);
+      err_sock = accept (serv_sock, (struct sockaddr *) &serv_addr, &len);
       if (err_sock < 0)
         error (EXIT_FAILURE, errno, "error accepting connection");
 
diff --git a/src/tftpd.c b/src/tftpd.c
index 99ac02b..1112c78 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -522,7 +522,7 @@ validate_access (char **filep, int mode)
 }
 
 int timeout;
-jmp_buf timeoutbuf;
+sigjmp_buf timeoutbuf;
 
 void
 timer (int sig)
diff --git a/telnet/externs.h b/telnet/externs.h
index d621dbf..4171a8e 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -78,9 +78,7 @@
 #ifdef HAVE_SYS_FILIO_H
 # include <sys/filio.h>
 #endif
-#ifdef CRAY
-# include <errno.h>
-#endif /* CRAY */
+#include <errno.h>
 #ifdef USE_TERMIO
 # ifndef VINTR
 #  ifdef SYSV_TERMIO
@@ -121,12 +119,6 @@ typedef unsigned char cc_t;
 
 #define SUBBUFSIZE     256
 
-#ifndef CRAY
-# ifndef errno
-extern int errno;              /* outside this world */
-# endif
-#endif /* !CRAY */
-
 extern int autologin,          /* Autologin enabled */
   skiprc,                      /* Don't process the ~/.telnetrc file */
   eight,                       /* use eight bit mode (binary in and/or out */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   12 ++++++++++++
 configure.ac     |    2 +-
 ftpd/extern.h    |    1 +
 src/rexec.c      |    9 +++++----
 src/tftpd.c      |    2 +-
 telnet/externs.h |   10 +---------
 6 files changed, 21 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GNU Inetutils