Merge lp:~clint-fewbar/ubuntu/natty/libedit/fix-tty-handling into lp:ubuntu/natty/libedit

[Clint Byrum]

This patch avoids setting the input TTY up when stdout is not a TTY.

[Marc Deslauriers (mdeslaur)]

review: Approve

[Marc Deslauriers (mdeslaur)]

The patch doesn't apply properly when the package builds. Could you please fix this, and compile-test it?

review: Needs Fixing

[lp:~clint-fewbar/ubuntu/natty/libedit/fix-tty-handling]

10. By Clint Byrum on 2011-01-27

fixing base level of patch

[Clint Byrum (clint-fewbar)]

Oops!

Tested in clean schroot sbuild after pushing rev 10, patches apply and test case still passes (php | less)

Unmerged revisions

10. By Clint Byrum on 2011-01-27

fixing base level of patch

9. By Clint Byrum on 2011-01-26

libedit/tty.c: grabs controlling terminal even when output is a non
tty, causing things like php | less to mis-function. Patch changes
this behavior to work more like readline. (LP: #322214)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-21 12:24:54 +0000
+++ debian/changelog	2011-01-27 19:02:10 +0000
@@ -1,3 +1,11 @@
+libedit (2.11-20080614-2ubuntu1) natty; urgency=low
+
+  * libedit/tty.c: grabs controlling terminal even when output is a non
+    tty, causing things like php | less to mis-function. Patch changes
+    this behavior to work more like readline. (LP: #322214)
+
+ -- Clint Byrum <[e-mail]>  Wed, 26 Jan 2011 13:04:09 -0800
+
 libedit (2.11-20080614-2) unstable; urgency=high
 
   * libedit2.shlibs: Fix minimal dependency version 

=== modified file 'debian/control'
--- debian/control	2009-06-22 11:55:49 +0000
+++ debian/control	2011-01-27 19:02:10 +0000
@@ -1,7 +1,8 @@
 Source: libedit
 Section: libs
 Priority: standard
-Maintainer: Anibal Monsalve Salazar <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <[e-mail]>
 Build-Depends: debhelper (>= 7), quilt, pmake (>= 1.45-8), groff-base,
  libbsd-dev (>= 0.1.3), libncurses5-dev, bsdmainutils
 Standards-Version: 3.8.2

=== added file 'debian/patches/30-change-tty-handling.patch'
--- debian/patches/30-change-tty-handling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/30-change-tty-handling.patch	2011-01-27 19:02:10 +0000
@@ -0,0 +1,20 @@
+From: Clint Byrum <[e-mail]>
+Subject: Do not setup the terminal if output is not a tty
+Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=3044367&group_id=18314&atid=118314
+Bug-Ubuntu: https://launchpad.net/bugs/322214
+Forwarded: yes, message sent to [e-mail]
+
+=== modified file 'libedit/tty.c'
+--- a/libedit/tty.c	2008-06-14 17:13:08 +0000
++++ b/libedit/tty.c	2011-01-26 21:03:59 +0000
+@@ -472,6 +472,9 @@
+ 	if (el->el_flags & EDIT_DISABLED)
+ 		return (0);
+ 
++	if (!isatty(fileno(el->el_outfile)))
++		return (-1);
++
+ 	if (tty_getty(el, &el->el_tty.t_ed) == -1) {
+ #ifdef DEBUG_TTY
+ 		(void) fprintf(el->el_errfile,
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-06-22 11:55:49 +0000
+++ debian/patches/series	2011-01-27 19:02:10 +0000
@@ -6,3 +6,4 @@
 10-define_SIZE_T_MAX.diff
 12-libedit-Makefile.diff
 20-fortify.patch
+30-change-tty-handling.patch