[svn] GnuPG - r5021 - in branches/STABLE-BRANCH-1-4: g10 include util

[svn author wk]

Author: wk
Date: 2009-05-22 17:38:49 +0200 (Fri, 22 May 2009)
New Revision: 5021

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/signal.c
   branches/STABLE-BRANCH-1-4/include/ttyio.h
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/ttyio.c
Log:
Fixed bug1058.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-20 16:12:25 UTC (rev 5020)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-22 15:38:49 UTC (rev 5021)
@@ -1,3 +1,7 @@
+2009-05-22  Werner Koch  <wk at g10code.com>
+
+	* signal.c (got_fatal_signal): Call tty_cleanup_after_signal.
+
 2009-05-20  Werner Koch  <wk at g10code.com>
 
 	* gpg.c (main): Fix --fingerprint/--with-fingerprint command

Modified: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-05-20 16:12:25 UTC (rev 5020)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2009-05-22 15:38:49 UTC (rev 5021)
@@ -1,3 +1,7 @@
+2009-05-22  Werner Koch  <wk at g10code.com>
+
+	* ttyio.c (tty_cleanup_after_signal): New.
+
 2009-05-05  Werner Koch  <wk at g10code.com>
 
 	* dotlock.c: Merged changes from GnuPG-2.  Better detection of

Modified: branches/STABLE-BRANCH-1-4/g10/signal.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/signal.c	2009-05-20 16:12:25 UTC (rev 5020)
+++ branches/STABLE-BRANCH-1-4/g10/signal.c	2009-05-22 15:38:49 UTC (rev 5021)
@@ -88,6 +88,7 @@
     rl_free_line_state ();
     rl_cleanup_after_signal ();
 #endif
+    tty_cleanup_after_signal ();
 
     /* Better don't translate these messages. */
     write(2, "\n", 1 );

Modified: branches/STABLE-BRANCH-1-4/include/ttyio.h
===================================================================
--- branches/STABLE-BRANCH-1-4/include/ttyio.h	2009-05-20 16:12:25 UTC (rev 5020)
+++ branches/STABLE-BRANCH-1-4/include/ttyio.h	2009-05-22 15:38:49 UTC (rev 5021)
@@ -53,5 +53,6 @@
 #define tty_enable_completion(x)
 #define tty_disable_completion()
 #endif
+void tty_cleanup_after_signal (void);
 
 #endif /*G10_TTYIO_H*/

Modified: branches/STABLE-BRANCH-1-4/util/ttyio.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ttyio.c	2009-05-20 16:12:25 UTC (rev 5020)
+++ branches/STABLE-BRANCH-1-4/util/ttyio.c	2009-05-22 15:38:49 UTC (rev 5021)
@@ -122,6 +122,14 @@
 }
 #endif
 
+void
+tty_cleanup_after_signal (void)
+{
+#ifdef HAVE_TCGETATTR
+  cleanup ();
+#endif
+}
+
 static void
 init_ttyfp(void)
 {