diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | defines.h | 19 | ||||
-rw-r--r-- | includes.h | 1 | ||||
-rw-r--r-- | sftp.c | 2 |
5 files changed, 32 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20050821 | ||
2 | - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for | ||
3 | LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@ | ||
4 | |||
1 | 20050816 | 5 | 20050816 |
2 | - (djm) [ttymodes.c] bugzilla #1054: Fix encoding of _POSIX_VDISABLE, | 6 | - (djm) [ttymodes.c] bugzilla #1054: Fix encoding of _POSIX_VDISABLE, |
3 | from Jacob Nevins; ok dtucker@ | 7 | from Jacob Nevins; ok dtucker@ |
@@ -2941,4 +2945,4 @@ | |||
2941 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2945 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2942 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2946 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2943 | 2947 | ||
2944 | $Id: ChangeLog,v 1.3874 2005/08/16 11:32:09 djm Exp $ | 2948 | $Id: ChangeLog,v 1.3875 2005/08/22 22:06:55 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 849112829..619a4e76a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.286 2005/08/16 00:48:41 tim Exp $ | 1 | # $Id: configure.ac,v 1.287 2005/08/22 22:06:56 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -555,6 +555,12 @@ mips-sony-bsd|mips-sony-newsos4) | |||
555 | AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty]) | 555 | AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty]) |
556 | AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix]) | 556 | AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix]) |
557 | ;; | 557 | ;; |
558 | |||
559 | *-*-lynxos) | ||
560 | CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__" | ||
561 | AC_DEFINE(MISSING_HOWMANY) | ||
562 | AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation]) | ||
563 | ;; | ||
558 | esac | 564 | esac |
559 | 565 | ||
560 | # Allow user to specify flags | 566 | # Allow user to specify flags |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.123 2005/08/10 11:52:36 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.124 2005/08/22 22:06:56 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -579,6 +579,23 @@ struct winsize { | |||
579 | # define SSH_SYSFDMAX 10000 | 579 | # define SSH_SYSFDMAX 10000 |
580 | #endif | 580 | #endif |
581 | 581 | ||
582 | #if defined(__Lynx__) | ||
583 | /* | ||
584 | * LynxOS defines these in param.h which we do not want to include since | ||
585 | * it will also pull in a bunch of kernel definitions. | ||
586 | */ | ||
587 | # define ALIGNBYTES (sizeof(int) - 1) | ||
588 | # define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES) | ||
589 | /* Missing prototypes on LynxOS */ | ||
590 | int snprintf (char *, size_t, const char *, ...); | ||
591 | int mkstemp (char *); | ||
592 | char *crypt (const char *, const char *); | ||
593 | int seteuid (uid_t); | ||
594 | int setegid (gid_t); | ||
595 | char *mkdtemp (char *); | ||
596 | int rresvport_af (int *, sa_family_t); | ||
597 | int innetgr (const char *, const char *, const char *, const char *); | ||
598 | #endif | ||
582 | 599 | ||
583 | /* | 600 | /* |
584 | * Define this to use pipes instead of socketpairs for communicating with the | 601 | * Define this to use pipes instead of socketpairs for communicating with the |
diff --git a/includes.h b/includes.h index 89ae26d06..9408fec9a 100644 --- a/includes.h +++ b/includes.h | |||
@@ -21,6 +21,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | 23 | ||
24 | #include <stdarg.h> | ||
24 | #include <stdio.h> | 25 | #include <stdio.h> |
25 | #include <ctype.h> | 26 | #include <ctype.h> |
26 | #include <errno.h> | 27 | #include <errno.h> |
@@ -1295,7 +1295,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1295 | xfree(dir); | 1295 | xfree(dir); |
1296 | } | 1296 | } |
1297 | 1297 | ||
1298 | #if HAVE_SETVBUF | 1298 | #if defined(HAVE_SETVBUF) && !defined(BROKEN_SETVBUF) |
1299 | setvbuf(stdout, NULL, _IOLBF, 0); | 1299 | setvbuf(stdout, NULL, _IOLBF, 0); |
1300 | setvbuf(infile, NULL, _IOLBF, 0); | 1300 | setvbuf(infile, NULL, _IOLBF, 0); |
1301 | #else | 1301 | #else |