[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-156-g0a83fb1

[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  0a83fb189cd3a7a81131b74b9aba0e0e1a838bad (commit)
      from  5868ae23cb8e3a31fb73d9bd58eace4c5ae8728f (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=0a83fb189cd3a7a81131b74b9aba0e0e1a838bad


commit 0a83fb189cd3a7a81131b74b9aba0e0e1a838bad
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Nov 17 22:10:05 2011 +0100

    telnet,telnetd: Portability to GNU/OpenSolaris.
    
    Some standard header inclusions were missing.

diff --git a/ChangeLog b/ChangeLog
index 7d936f3..967f0be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-17  Mats Erik Andersson <address@hidden>
+
+       * telnet/telnet.c [HAVE_LIBREADLINE]: Include <curses.h>.
+       * telnetd/utility.c [HAVE_LIBREADLINE]: Likewise.
+       [HAVE_STREAMSPTY && ...]: Include <stropts.h>.
+       * telnetd/state.c [HAVE_STREAMSPTY && ...]: Likewise.
+       [!NTELOPTS]: Define NTELOPTS.
+
 2011-11-14  Simon Josefsson  <address@hidden>
 
        * README (Notes): Doc fix.
diff --git a/telnet/telnet.c b/telnet/telnet.c
index ba057c9..ebfd86c 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -74,6 +74,7 @@
 #include "general.h"
 
 #ifdef HAVE_LIBREADLINE
+# include <curses.h>
 # include <term.h>
 #endif
 
diff --git a/telnetd/state.c b/telnetd/state.c
index 3d218b0..3aa4063 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -52,6 +52,15 @@
 #include "telnetd.h"
 #include <stdarg.h>
 
+#if defined HAVE_STREAMSPTY && defined TIOCSIGNAL \
+       && defined HAVE_STROPTS_H
+# include <stropts.h>  /* I_FLUSH, FLUSHR */
+#endif
+
+#ifndef NTELOPTS       /* OpenSolaris */
+# define NTELOPTS      (1+TELOPT_NEW_ENVIRON)
+#endif
+
 /* Format lines for corresponing commands */
 char doopt[] = { IAC, DO, '%', 'c', 0 };
 char dont[] = { IAC, DONT, '%', 'c', 0 };
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 47dc22a..3fd054e 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -38,9 +38,14 @@
 #endif
 
 #ifdef HAVE_LIBREADLINE
+# include <curses.h>
 # include <term.h>
 #endif
 
+#if defined HAVE_STREAMSPTY && defined HAVE_GETMSG \
+       && defined HAVE_STROPTS_H
+# include <stropts.h>
+#endif
 
 static char netobuf[BUFSIZ + NETSLOP], *nfrontp, *nbackp;
 static char *neturg;           /* one past last byte of urgent data */

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 telnet/telnet.c   |    1 +
 telnetd/state.c   |    9 +++++++++
 telnetd/utility.c |    5 +++++
 4 files changed, 23 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils