[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-60-g71ece60

[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  71ece60ff8e8542f1dab59456f63edf1a0a371fd (commit)
      from  0c86f004feb5fb21ab871dff983ec390d78a2f7b (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=71ece60ff8e8542f1dab59456f63edf1a0a371fd


commit 71ece60ff8e8542f1dab59456f63edf1a0a371fd
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Jan 18 17:47:05 2020 +0100

    Minor portability glitches in Solaris and in AIX.

diff --git a/ChangeLog b/ChangeLog
index e0438ee..0bad4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-01-18  Mats Erik Andersson  <address@hidden>
+
+       Minor portability glitches in Solaris and in AIX.
+
+       * am/libcurses.m4 (IU_LIB_TERMCAP) [!_XOPEN_CURSES]: Conditionally
+       include the header <term.h>.
+       * telnet/telnet.c [HAVE_CURSES_TGETENT & !_XOPEN_CURSES]: Likewise.
+       * telnetd/utility.c [HAVE_CURSES_TGETENT & !_XOPEN_CURSES]: Likewise.
+
+       * ftp/ftp.c (h_errno): Delete declaration, not in use.
+       * ftpd/ftpd.c (FTP_NAMES): Assign a value to this macro.
+
 2020-01-14  Mats Erik Andersson  <address@hidden>
 
        Make test of ftp-parser slightly more forgiving.  Darwin systems
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 73e9fc2..54d2b41 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -81,8 +81,11 @@ dnl including ncurses (unless --disable ncurses is 
specified), curses (which
 dnl does so on some systems), termcap, and termlib.  If termcap is found, then
 dnl LIBTERMCAP is defined with the appropriate linker specification.
 dnl
-dnl Solaris is known to use libtermcap for tgetent, but to declare tgetent
-dnl in <term.h>!
+dnl Solaris is known to offer tgetent encapsulated in libtermcap, but to
+dnl declare tgetent also in <term.h>!  When X/Open Curses is present as
+dnl primary implementation, the header file <term.h> is included already
+dnl in <curses.h>, and the first available <term.h> may in fact cause
+dnl contradictions.
 dnl
 AC_DEFUN([IU_LIB_TERMCAP], [
   AC_REQUIRE([IU_LIB_NCURSES])
@@ -106,7 +109,9 @@ AC_DEFUN([IU_LIB_TERMCAP], [
        location_tgetent=termcap.h],
       [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM([[#include <curses.h>
-#include <term.h>]],
+#ifndef _XOPEN_CURSES
+# include <term.h>
+#endif]],
          [[(void) tgetent((char *) 0, (char *) 0);]])],
        [AC_DEFINE([HAVE_CURSES_TGETENT], 1,
          [Define to 1 if tgetent() exists in <term.h>.])
@@ -122,7 +127,9 @@ AC_DEFUN([IU_LIB_TERMCAP], [
     else
       AC_CHECK_LIB(curses, tgetent, LIBTERMCAP=-lcurses)
       AC_CHECK_DECLS([tgetent], , , [[#include <curses.h>
-#include <term.h>]])
+#ifndef _XOPEN_CURSES
+# include <term.h>
+#endif]])
       if test "$ac_cv_lib_curses_tgetent" = yes \
          && test "$ac_cv_have_decl_tgetent" = yes; then
        AC_DEFINE([HAVE_CURSES_TGETENT], 1)
diff --git a/ftp/ftp.c b/ftp/ftp.c
index e003a9b..0dd19b3 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -98,8 +98,6 @@ extern int fclose (FILE *);
 extern int pclose (FILE *);
 #endif
 
-extern int h_errno;
-
 int data = -1;
 int abrtflag = 0;
 jmp_buf ptabort;
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index b5b786c..08ff522 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -66,7 +66,7 @@
 # include <netinet/ip.h>
 #endif
 
-#define FTP_NAMES
+#define FTP_NAMES 1
 #include <arpa/ftp.h>
 #include <arpa/inet.h>
 #include <arpa/telnet.h>
diff --git a/telnet/telnet.c b/telnet/telnet.c
index c42bef1..f42957e 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -75,7 +75,9 @@
 # include <termcap.h>
 #elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
-# include <term.h>
+# ifndef _XOPEN_CURSES
+#  include <term.h>
+# endif
 #endif
 
 #ifdef AUTHENTICATION
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 5bd879d..dc87e9a 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -39,7 +39,9 @@
 # include <termcap.h>
 #elif defined HAVE_CURSES_TGETENT
 # include <curses.h>
-# include <term.h>
+# ifndef _XOPEN_CURSES
+#  include <term.h>
+# endif
 #endif
 
 #if defined HAVE_STREAMSPTY && defined HAVE_GETMSG     \

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

Summary of changes:
 ChangeLog         | 12 ++++++++++++
 am/libcurses.m4   | 15 +++++++++++----
 ftp/ftp.c         |  2 --
 ftpd/ftpd.c       |  2 +-
 telnet/telnet.c   |  4 +++-
 telnetd/utility.c |  4 +++-
 6 files changed, 30 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils