head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.2 date 2000.12.15.00.41.05; author wiz; state dead; branches; next 1.1; 1.1 date 99.11.26.22.12.38; author hubertf; state Exp; branches; next ; desc @@ 1.2 log @Move packages from 'net' into new 'chat' category. Add chat to main Makefile. @ text @$NetBSD: patch-an,v 1.1 1999/11/26 22:12:38 hubertf Exp $ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/readline/readline.c --- ./readline/readline.c Fri Feb 24 22:20:03 1995 +++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/readline/readline.c Fri Nov 26 22:56:30 1999 @@@@ -48,7 +48,11 @@@@ # include #endif +#if !defined(__linux__) #define NEW_TTY_DRIVER +#else +#define TERMIOS_TTY_DRIVER +#endif #define HAVE_BSD_SIGNALS /* #define USE_XON_XOFF */ @@@@ -80,6 +84,10 @@@@ # if !defined (O_NDELAY) # define O_NDELAY O_NONBLOCK /* Posix-style non-blocking i/o */ # endif /* O_NDELAY */ +#else +# ifdef TERMIOS_TTY_DRIVER +# include +# endif /* !TERMIOS_MISSING */ #endif /* _POSIX_VERSION */ /* Other (BSD) machines use sgtty. */ @@@@ -133,7 +141,7 @@@@ # endif /* USGr3 */ #endif /* USG && hpux */ -#if defined (_POSIX_VERSION) || defined (USGr3) +#if defined (_POSIX_VERSION) || defined (USGr3) || defined(__linux__) # include # define direct dirent # if defined (_POSIX_VERSION) @@@@ -280,7 +288,7 @@@@ static FILE *in_stream, *out_stream; /* The names of the streams that we do input and output to. */ -FILE *rl_instream = stdin, *rl_outstream = stdout; +FILE *rl_instream = NULL, *rl_outstream = NULL; /* Non-zero means echo characters as they are read. */ int readline_echoing_p = 1; @@@@ -1152,6 +1160,8 @@@@ { /* Find out if we are running in Emacs. */ running_in_emacs = getenv ("EMACS"); + rl_instream = stdin; + rl_outstream = stdout; /* Allocate data structures. */ if (!rl_line_buffer) @@@@ -2505,7 +2515,11 @@@@ tio.c_lflag &= ~(ICANON | ECHO); - if (otio.c_cc[VEOF] != _POSIX_VDISABLE) +#ifdef ONLCR + tio.c_oflag |= OPOST|ONLCR; +#endif + + if ((unsigned char)otio.c_cc[VEOF] != (unsigned char)_POSIX_VDISABLE) eof_char = otio.c_cc[VEOF]; #if defined (USE_XON_XOFF) @ 1.1 log @Split patches and add code to print time in front of each line. Needs to be switched on from .icbrc: oset printtime true. Bump version to 5.0.9pl1 for that. @ text @d1 1 a1 1 $NetBSD$ @