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