Siteshwar Vashisht f94660
From 262639471df23c1e898b3e74d68db23b02dbbefc Mon Sep 17 00:00:00 2001
Siteshwar Vashisht f94660
From: Siteshwar Vashisht <svashisht@redhat.com>
Siteshwar Vashisht f94660
Date: Tue, 17 May 2016 18:05:03 +0530
Siteshwar Vashisht f94660
Subject: [PATCH] Do not set terminate_immediately and interrupt_immediately
Siteshwar Vashisht f94660
 while expanding tilda
Siteshwar Vashisht f94660
Siteshwar Vashisht f94660
---
Siteshwar Vashisht f94660
 general.c | 13 -------------
Siteshwar Vashisht f94660
 1 file changed, 13 deletions(-)
Siteshwar Vashisht f94660
Siteshwar Vashisht f94660
diff --git a/general.c b/general.c
Siteshwar Vashisht f94660
index 087689e..220543c 100644
Siteshwar Vashisht f94660
--- a/general.c
Siteshwar Vashisht f94660
+++ b/general.c
Siteshwar Vashisht f94660
@@ -983,16 +983,6 @@ bash_tilde_expand (s, assign_p)
Siteshwar Vashisht f94660
   int old_immed, old_term, r;
Siteshwar Vashisht f94660
   char *ret;
Siteshwar Vashisht f94660
 
Siteshwar Vashisht f94660
-  old_immed = interrupt_immediately;
Siteshwar Vashisht f94660
-  old_term = terminate_immediately;
Siteshwar Vashisht f94660
-  /* We want to be able to interrupt tilde expansion. Ordinarily, we can just
Siteshwar Vashisht f94660
-     jump to top_level, but we don't want to run any trap commands in a signal
Siteshwar Vashisht f94660
-     handler context.  We might be able to get away with just checking for
Siteshwar Vashisht f94660
-     things like SIGINT and SIGQUIT. */
Siteshwar Vashisht f94660
-  if (any_signals_trapped () < 0)
Siteshwar Vashisht f94660
-    interrupt_immediately = 1;
Siteshwar Vashisht f94660
-  terminate_immediately = 1;
Siteshwar Vashisht f94660
-
Siteshwar Vashisht f94660
   tilde_additional_prefixes = assign_p == 0 ? (char **)0
Siteshwar Vashisht f94660
   					    : (assign_p == 2 ? bash_tilde_prefixes2 : bash_tilde_prefixes);
Siteshwar Vashisht f94660
   if (assign_p == 2)
Siteshwar Vashisht f94660
@@ -1001,9 +991,6 @@ bash_tilde_expand (s, assign_p)
Siteshwar Vashisht f94660
   r = (*s == '~') ? unquoted_tilde_word (s) : 1;
Siteshwar Vashisht f94660
   ret = r ? tilde_expand (s) : savestring (s);
Siteshwar Vashisht f94660
 
Siteshwar Vashisht f94660
-  interrupt_immediately = old_immed;
Siteshwar Vashisht f94660
-  terminate_immediately = old_term;
Siteshwar Vashisht f94660
-
Siteshwar Vashisht f94660
   QUIT;
Siteshwar Vashisht f94660
 
Siteshwar Vashisht f94660
   return (ret);
Siteshwar Vashisht f94660
-- 
Siteshwar Vashisht f94660
2.5.5
Siteshwar Vashisht f94660