- (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for

   LynxOS, patch from Olli Savia (ops at iki.fi).  ok djm@

diff --git a/ChangeLog b/ChangeLog
index fc67023c20f202a6a2da4d2de56178ecd0280c8e..5ed600e2f9766d9ddc05e496fe793ceb13fbc83a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050821
+ - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for
+   LynxOS, patch from Olli Savia (ops at iki.fi).  ok djm@
+
 20050816
  - (djm) [ttymodes.c] bugzilla #1054: Fix encoding of _POSIX_VDISABLE,
    from Jacob Nevins; ok dtucker@

diff --git a/configure.ac b/configure.ac
index 6ad8ba222716262adebb6582a549798a756d928a..5b1ad46774892290ecd2bf778c48d46518138a18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -555,6 +555,12 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty])
        AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
        ;;
+
+*-*-lynxos)
+        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+        AC_DEFINE(MISSING_HOWMANY)
+        AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation])
+        ;;
 esac
 
 # Allow user to specify flags

diff --git a/defines.h b/defines.h
index 8ab85cacc6eceac2690474b4fbc371be374283e7..c53af57650d8fe941009bb86777613233c2ccfc8 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -579,6 +579,23 @@ struct winsize {
 # define SSH_SYSFDMAX 10000
 #endif
 
+#if defined(__Lynx__)
+ /*
+  * LynxOS defines these in param.h which we do not want to include since
+  * it will also pull in a bunch of kernel definitions.
+  */
+# define ALIGNBYTES (sizeof(int) - 1)
+# define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
+  /* Missing prototypes on LynxOS */
+  int snprintf (char *, size_t, const char *, ...);
+  int mkstemp (char *);
+  char *crypt (const char *, const char *);
+  int seteuid (uid_t);
+  int setegid (gid_t);
+  char *mkdtemp (char *);
+  int rresvport_af (int *, sa_family_t);
+  int innetgr (const char *, const char *, const char *, const char *);
+#endif
 
 /*
  * Define this to use pipes instead of socketpairs for communicating with the

diff --git a/includes.h b/includes.h
index 89ae26d068f235186e99a5057019a3affaf73a9e..9408fec9a77f2c30ca7cd6f9e34cfc4cf4198b0b 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -21,6 +21,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>

diff --git a/sftp.c b/sftp.c
index 9f6c88fb555da38dd8abc98cc79e706610e4d882..f98ed7d27505c0cf24f4b8f7cb2c292b49f9087c 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1295,7 +1295,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
                xfree(dir);
        }
 
-#if HAVE_SETVBUF
+#if defined(HAVE_SETVBUF) && !defined(BROKEN_SETVBUF)
        setvbuf(stdout, NULL, _IOLBF, 0);
        setvbuf(infile, NULL, _IOLBF, 0);
 #else