[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-94-g0d208b7

[Alfred M. Szmidt]

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  0d208b7e07f217d2497dbc345a6606596a6379ef (commit)
       via  f68e9634ac93f404808ca3f6efe6fee5bb4dc3c4 (commit)
      from  c82c64249d4c022b6b1c96ae1a828c411be3a5aa (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=0d208b7e07f217d2497dbc345a6606596a6379ef


commit 0d208b7e07f217d2497dbc345a6606596a6379ef
Author: Alfred M. Szmidt <address@hidden>
Date:   Sun Jun 5 18:09:54 2011 +0200

    Clean up `make syntax-check' errors.

diff --git a/ChangeLog b/ChangeLog
index c0ca76a..64afaa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2011-06-05  Alfred M. Szmidt  <address@hidden>
 
+       Clean up `make syntax-check' errors.
+
+       * tests/addrpeek.c: Include <config.h> instead of "config.h".
+       (main): Call set_program_name.
+
+       * src/syslogd.c (init): Removed redundant if statment before free
+       call.
+
+       * libls/stat_flags.c: Don't include <stddef.h>.
+
+       * ifconfig/changeif.c (set_address): Fix typo.
+       * src/logger.c (parse_opt): Likewise.
+       * src/rlogin.c: Likewise.
+       * talk/invite.c (answers): Likewise.
+
+       * ftp/ftp.c: Removed redundant parentehsis in #if guard.
+
+2011-06-05  Alfred M. Szmidt  <address@hidden>
+
        * configure.ac: Don't check for <osockaddr.h>.
        * talkd/intalkd.h [HAVE_OSOCKADDR_H]: Don't include <osockaddr.h>.
        * talk/look_up.c: Likewise.
diff --git a/NEWS b/NEWS
index 7fdb04c..78e651f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 GNU inetutils NEWS -- history of user-visible changes.
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-See the end of this file for for license conditions.
+See the end of this file for license conditions.
 
 Please send inetutils bug reports to <address@hidden>.
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index de80015..c01ea61 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -58,8 +58,7 @@
 This manual documents version @value{VERSION} of the @sc{gnu} networking
 utilities.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 
2009, 2010, 2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/ftp/ftp.c b/ftp/ftp.c
index e8d21e1..733a268 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -114,7 +114,7 @@ static char portstr[10];
 
 FILE *cin, *cout;
 
-#if ! defined (FTP_CONNECT_TIMEOUT) || FTP_CONNECT_TIMEOUT < 1
+#if ! defined FTP_CONNECT_TIMEOUT || FTP_CONNECT_TIMEOUT < 1
 # define FTP_CONNECT_TIMEOUT 5
 #endif
 
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 747a7db..d245733 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -70,7 +70,7 @@ set_address (int sfd, struct ifreq *ifr, char *address)
 
   if (!host)
     {
-      error (0, 0, "can not resolve `%s': %s", address, hstrerror (h_errno));
+      error (0, 0, "cannot resolve `%s': %s", address, hstrerror (h_errno));
       return -1;
     }
   if (host->h_addrtype != AF_INET)
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index 4c378ba..82622b5 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -51,7 +51,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <stddef.h>
 #include <string.h>
 
 #define SAPPEND(s) {                                                   \
diff --git a/src/logger.c b/src/logger.c
index c268276..86e7523 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -407,7 +407,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 #else /* !HAVE_IPV6 */
       /* Print a warning but continue with IPv4.  */
-      error (0, 0, "Warning: Falling back to IPv4, "
+      error (0, 0, "warning: Falling back to IPv4, "
                "since IPv6 is disabled");
       /* AF_INET is set by default in this case.  */
       break;
diff --git a/src/rlogin.c b/src/rlogin.c
index 004e31f..5852edd 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -143,7 +143,7 @@ int wlen;
 # define TIOCPKT_DOSTOP          0x20
 #endif /*TIOCPKT*/
 /* The server sends us a TIOCPKT_WINDOW notification when it starts up.
-   The value for this (0x80) can not overlap the kernel defined TIOCPKT_xxx
+   The value for this (0x80) cannot overlap the kernel defined TIOCPKT_xxx
    values.  */
 #ifndef TIOCPKT_WINDOW
 # define TIOCPKT_WINDOW        0x80
diff --git a/src/syslogd.c b/src/syslogd.c
index 5927f9f..c03b687 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1605,8 +1605,7 @@ init (int signo ARG_UNUSED)
          free (f->f_un.f_user.f_unames);
          break;
        }
-      if (f->f_prevhost)
-       free (f->f_prevhost);
+      free (f->f_prevhost);
       next = f->f_next;
       free (f);
     }
diff --git a/talk/invite.c b/talk/invite.c
index 564685f..dbf6280 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -70,7 +70,7 @@ static char *answers[] = {
   "Target machine is too confused to talk to us",      /* FAILED */
   "Target machine does not recognize us",      /* MACHINE_UNKNOWN */
   "Your party is refusing messages",   /* PERMISSION_REFUSED */
-  "Target machine can not handle remote talk", /* UNKNOWN_REQUEST */
+  "Target machine cannot handle remote talk",  /* UNKNOWN_REQUEST */
   "Target machine indicates protocol mismatch",        /* BADVERSION */
   "Target machine indicates protocol botch (addr)",    /* BADADDR */
   "Target machine indicates protocol botch (ctl_addr)",        /* BADCTLADDR */
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 5994c8a..44445eb 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -427,7 +427,7 @@ clientstat (register int code, register int parm1, register 
int parm2)
          /*
           * If using kludge linemode, make sure that
           * we can do what the client asks.
-          * We can not turn off linemode if alwayslinemode
+          * We cannot turn off linemode if alwayslinemode
           * and the ICANON bit is set.
           */
          if (lmodetype == KLUDGE_LINEMODE)
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index 4ba9644..811dc9b 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -40,7 +40,8 @@
  *    tcpmux/env stream tcp nowait nobody /tmp/addrpeek addrkeep env addr
  */
 
-#include "config.h"
+#include <config.h>
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -49,6 +50,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <progname.h>
 
 #ifndef SEPARATOR
 # define SEPARATOR "\n"
@@ -111,7 +113,7 @@ int
 main (int argc, char *argv[])
 {
   int j;
-
+  set_program_name (argv[0]);
   for (j = 1; j < argc; ++j)
     {
       if (strncmp (argv[j], "addr", strlen ("addr")) == 0)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=f68e9634ac93f404808ca3f6efe6fee5bb4dc3c4


commit f68e9634ac93f404808ca3f6efe6fee5bb4dc3c4
Author: Alfred M. Szmidt <address@hidden>
Date:   Sun Jun 5 14:46:19 2011 +0200

    talkd, talk: Remove last traces of <osockaddr.h> usage.

diff --git a/ChangeLog b/ChangeLog
index 09cdd2c..c0ca76a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-05  Alfred M. Szmidt  <address@hidden>
+
+       * configure.ac: Don't check for <osockaddr.h>.
+       * talkd/intalkd.h [HAVE_OSOCKADDR_H]: Don't include <osockaddr.h>.
+       * talk/look_up.c: Likewise.
+       * talk/invite.c: Likewise.
+       * talk/get_names.c: Likewise.
+       * talk/get_addrs.c: Likewise.
+       * talk/ctl_transact.c: Likewise.
+       * talk/ctl.c: Likewise.
+
 2011-05-09  Simon Josefsson  <address@hidden>
 
        * bootstrap.conf (gnulib_modules): Removed 'exit' from list.
diff --git a/configure.ac b/configure.ac
index 6c52213..c1fc9b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -433,7 +433,7 @@ dnl ftpd have support for it.
 
 if test "$with_wrap" = yes; then
 dnl See if we have libwrap.a
-dnl we can not use AC_CHECK_LIB reliably since for the wrap lib
+dnl we cannot use AC_CHECK_LIB reliably since for the wrap lib
 dnl you have to define some global variables
 #AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
   AC_MSG_CHECKING(hosts_ctl in -lwrap);
@@ -494,14 +494,6 @@ AC_CHECK_TYPE(socklen_t, ,
               [IU_FLUSHLEFT([#include <sys/types.h>
                             #include <sys/socket.h>])])
 
-dnl We may need our own definition for struct osockaddr (equivalent to the
-dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
-AC_CHECK_TYPE(struct osockaddr, ,
-              [AC_DEFINE([HAVE_OSOCKADDR_H], 1,
-                         [Define to one if you have <osockaddr.h>.])],
-             [IU_FLUSHLEFT([#include <sys/types.h>
-                             #include <sys/socket.h> ])])
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <sys/socket.h>
diff --git a/talk/ctl.c b/talk/ctl.c
index 54e2aad..f077727 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -57,9 +57,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netinet/in.h>
 #include "talk.h"
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 8fd4947..46a865f 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -55,9 +55,6 @@
 #include <time.h>
 #include <netinet/in.h>
 #include <sys/select.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <errno.h>
 #include "talk_ctl.h"
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 6b3792a..b2af9a4 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -55,9 +55,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netdb.h>
 #include <stdio.h>
diff --git a/talk/get_names.c b/talk/get_names.c
index 0386d0b..5f458ce 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -55,9 +55,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <netinet/in.h>
 #include <protocols/talkd.h>
 #include <pwd.h>
diff --git a/talk/invite.c b/talk/invite.c
index 6ba7f88..564685f 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -57,9 +57,6 @@
 #include <time.h>
 #include <signal.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/talk/look_up.c b/talk/look_up.c
index ade177a..f7c7665 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -54,9 +54,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 2f32116..3cd7bec 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -22,9 +22,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef HAVE_OSOCKADDR_H
-# include <osockaddr.h>
-#endif
 #include <protocols/talkd.h>
 #include <netdb.h>
 #include <syslog.h>

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

Summary of changes:
 ChangeLog           |   30 ++++++++++++++++++++++++++++++
 NEWS                |    2 +-
 configure.ac        |   10 +---------
 doc/inetutils.texi  |    3 +--
 ftp/ftp.c           |    2 +-
 ifconfig/changeif.c |    2 +-
 libls/stat_flags.c  |    1 -
 src/logger.c        |    2 +-
 src/rlogin.c        |    2 +-
 src/syslogd.c       |    3 +--
 talk/ctl.c          |    3 ---
 talk/ctl_transact.c |    3 ---
 talk/get_addrs.c    |    3 ---
 talk/get_names.c    |    3 ---
 talk/invite.c       |    5 +----
 talk/look_up.c      |    3 ---
 talkd/intalkd.h     |    3 ---
 telnetd/termstat.c  |    2 +-
 tests/addrpeek.c    |    6 ++++--
 19 files changed, 44 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
GNU Inetutils