[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-192-gc310f11

[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  c310f1175dc34175bf0b38e8007dcb4412ff1df1 (commit)
      from  23da8c3a7f92394db007ee19ad7b7609fe6290aa (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=c310f1175dc34175bf0b38e8007dcb4412ff1df1


commit c310f1175dc34175bf0b38e8007dcb4412ff1df1
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Dec 9 16:17:08 2011 +0100

    telnet,telnetd: Fix ncurses/termio for Solaris.

diff --git a/ChangeLog b/ChangeLog
index c3417ee..d7ce537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-09  Mats Erik Andersson <address@hidden>
+
+       * telnet/Makefile.am (INCLUDES): Add $(NCURSES_INCLUDE) to list.
+       * telnetd/Makefile.am: Likewise.
+       * telnetd/utility.c (readstream) [HAVE_STREAMSPTY && HAVE_TERMIO_H]:
+       Make use of `struct termio' conditioned on HAVE_TERMIO_H.
+
 2011-12-03  Mats Erik Andersson <address@hidden>
 
        * tests/syslogd.sh: Random test directory.  Identity from id(1).
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 9ea0935..8d10f8c 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -26,7 +26,7 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c 
sys_bsd.c \
 
 noinst_HEADERS = defines.h externs.h general.h ring.h types.h
 
-INCLUDES = $(iu_INCLUDES)
+INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
 AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index be08ada..df497a6 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,6 +29,6 @@ noinst_HEADERS = telnetd.h
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH)
+INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE)
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) 
$(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) $(LIBREADLINE)
diff --git a/telnetd/utility.c b/telnetd/utility.c
index bb49298..c9dbeeb 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -72,7 +72,9 @@ readstream (int p, char *ibuf, int bufsize)
   int flags = 0;
   int ret = 0;
   struct termios *tsp;
+#ifdef HAVE_TERMIO_H
   struct termio *tp;
+#endif
   struct iocblk *ip;
   char vstop, vstart;
   int ixon;
@@ -130,6 +132,7 @@ readstream (int p, char *ibuf, int bufsize)
          ixon = tsp->c_iflag & IXON;
          break;
 
+#ifdef HAVE_TERMIO_H
        case TCSETA:
        case TCSETAW:
        case TCSETAF:
@@ -138,6 +141,7 @@ readstream (int p, char *ibuf, int bufsize)
          vstart = tp->c_cc[VSTART];
          ixon = tp->c_iflag & IXON;
          break;
+#endif /* HAVE_TERMIO_H */
 
        default:
          errno = EAGAIN;

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

Summary of changes:
 ChangeLog           |    7 +++++++
 telnet/Makefile.am  |    2 +-
 telnetd/Makefile.am |    2 +-
 telnetd/utility.c   |    4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils