[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-97-g00a01d9

[Simon Josefsson]

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  00a01d95c1a288410d79949547cec890549512ff (commit)
      from  e0ecdab5bebdcc5e1524005cb0029b9114709d6c (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=00a01d95c1a288410d79949547cec890549512ff


commit 00a01d95c1a288410d79949547cec890549512ff
Author: Simon Josefsson <address@hidden>
Date:   Thu Jun 16 13:13:46 2011 +0200

    Replace use of sig_t with sighandler_t.

diff --git a/ChangeLog b/ChangeLog
index 64fccbe..60cf0ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-16  Simon Josefsson  <address@hidden>
+
+       * configure.ac: Don't check for sig_t.
+       * libinetutils/setsig.c (setsig): Use sighandler_t instead of sig_t.
+       Reported by Mats Erik Andersson <address@hidden>.
+       * ftp/cmds.c (mput, mget, mdelete, mls, shell, doproxy): Likewise.
+       * ftp/ftp.c (command, getreply, sendrequest, recvrequest)
+       (pswitch, proxtrans): Likewise.
+       * src/rlogin.c (setsignal): Likewise.
+       * src/rcp.c (susystem): Likewise.
+
 2011-06-15  Mats Erik Andersson <address@hidden>
 
        * src/syslogd.c (fprintlog): Sanity check on `f->f_prevhost'
diff --git a/configure.ac b/configure.ac
index c1fc9b5..c818dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -499,11 +499,6 @@ AC_CHECK_TYPES(struct if_nameindex, , ,
                  #include <sys/socket.h>
                  #include <net/if.h>])])
 
-dnl sig_t is the type of a signal handler (4.4BSD)
-AC_CHECK_TYPES(sig_t, , ,
-  [IU_FLUSHLEFT([#include <sys/types.h>
-                 #include <signal.h> ])])
-
 dnl sigset_t is a set of signals (4.4BSD)
 AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 4a97f26..58dd5a6 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -546,7 +546,7 @@ void
 mput (int argc, char **argv)
 {
   int i;
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
 
   if (argc < 2 && !another (&argc, &argv, "local-files"))
@@ -862,7 +862,7 @@ mabort (int signo ARG_UNUSED)
 void
 mget (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
   char *cp, *tp;
 
@@ -1364,7 +1364,7 @@ delete (int argc, char **argv)
 void
 mdelete (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer;
   char *cp;
 
@@ -1475,7 +1475,7 @@ out:
 void
 mls (int argc, char **argv)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int ointer, i;
   char *cmd, mode[1], *dest;
 
@@ -1542,7 +1542,7 @@ void
 shell (int argc, char **argv)
 {
   pid_t pid;
-  sig_t old1, old2;
+  sighandler_t old1, old2;
   char shellnam[40], *shell, *namep;
 
   old1 = signal (SIGINT, SIG_IGN);
@@ -1965,7 +1965,7 @@ void
 doproxy (int argc, char **argv)
 {
   struct cmd *c;
-  sig_t oldintr;
+  sighandler_t oldintr;
 
   if (argc < 2 && !another (&argc, &argv, "command"))
     {
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 733a268..ecf4e67 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -357,7 +357,7 @@ command (const char *fmt, ...)
 {
   va_list ap;
   int r;
-  sig_t oldintr;
+  sighandler_t oldintr;
 
   abrtflag = 0;
   if (debug)
@@ -403,7 +403,7 @@ getreply (int expecteof)
   int c, n;
   int dig;
   int originalcode = 0, continuation = 0;
-  sig_t oldintr;
+  sighandler_t oldintr;
   int pflag = 0;
   char *cp, *pt = pasv;
 
@@ -542,7 +542,7 @@ sendrequest (char *cmd, char *local, char *remote, int 
printnames)
   int c, d;
   FILE *fin, *dout = 0, *popen (const char *, const char *);
   int (*closefunc) (FILE *);
-  sig_t oldintr, oldintp;
+  sighandler_t oldintr, oldintp;
   long bytes = 0, local_hashbytes = hashbytes;
   char *lmode, buf[BUFSIZ], *bufp;
 
@@ -824,7 +824,7 @@ recvrequest (char *cmd, char *local, char *remote, char 
*lmode, int printnames)
 {
   FILE *fout, *din = 0;
   int (*closefunc) (FILE *);
-  sig_t oldintr, oldintp;
+  sighandler_t oldintr, oldintp;
   int c, d, is_retr, tcrflag, bare_lfs = 0, blksize;
   static int bufsize = 0;
   static char *buf;
@@ -1534,7 +1534,7 @@ psabort (int sig)
 void
 pswitch (int flag)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   static struct comvars
   {
     int connect;
@@ -1652,7 +1652,7 @@ abortpt (int sig)
 void
 proxtrans (char *cmd, char *local, char *remote)
 {
-  sig_t oldintr;
+  sighandler_t oldintr;
   int secndflag = 0, prox_type, nfnd;
   char *cmd2;
   fd_set mask;
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index ff519c9..3fa3c08 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -27,8 +27,8 @@
 
 /* This is exactly like the traditional signal function, but turns on the
    SA_RESTART bit where possible.  */
-sig_t
-setsig (int sig, sig_t handler)
+sighandler_t
+setsig (int sig, sighandler_t handler)
 {
 #ifdef HAVE_SIGACTION
   struct sigaction sa;
diff --git a/src/rcp.c b/src/rcp.c
index 68eb147..a05145a 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1169,7 +1169,7 @@ bad:
 int
 susystem (char *s, int userid)
 {
-  sig_t istat, qstat;
+  sighandler_t istat, qstat;
   int status;
   pid_t pid;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index 5852edd..f709bd4 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -209,7 +209,7 @@ RETSIGTYPE writeroob (int);
 void warning (const char *, ...);
 #endif
 
-extern sig_t setsig (int, sig_t);
+extern sighandler_t setsig (int, sighandler_t);
 
 #if defined KERBEROS || defined SHISHI
 # define OPTIONS       "8EKde:k:l:xhV"
@@ -771,7 +771,7 @@ doit (sigset_t * smask)
 void
 setsignal (int sig)
 {
-  sig_t handler;
+  sighandler_t handler;
   sigset_t sigs;
 
   sigemptyset (&sigs);

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 configure.ac          |    5 -----
 ftp/cmds.c            |   12 ++++++------
 ftp/ftp.c             |   12 ++++++------
 libinetutils/setsig.c |    4 ++--
 src/rcp.c             |    2 +-
 src/rlogin.c          |    4 ++--
 7 files changed, 28 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU Inetutils