rpms/tcsh
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Regression in tcsh-6.19.00-026-quote-backslashes-properly.patch fixed

Browse Source 
Resolves: #1333523
This commit is contained in:
David Kaspar [Dee'Kej] 2016-05-16 12:56:11 +02:00
parent 628a187b3d
commit 4fa96ac104
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tcsh-6.19.00-026-quote-backslashes-properly.patch
View File

@ -1,7 +1,7 @@
From 9a763dd9b9b88f9c8cd235fddfda839c6b7971cb Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Tue, 8 Mar 2016 15:45:26 +0000
Subject: [PATCH] PR/526: David Kaspar: Quote backslashes properly so that they
Subject: [PATCH 1/3] PR/526: David Kaspar: Quote backslashes properly so that they
can be preserved in `` expansions.
---
@ -51,3 +51,54 @@ index 8a6d1b0..eae8a03 100644
--
2.5.5
From d52d669405da2fce61bd04bf80915e2e6ac5e842 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Fri, 13 May 2016 15:08:12 +0000
Subject: [PATCH 2/3] PR/526: Now that backslashes are quoted, we don't need to
handle them specially here. Fixes echo '\n'<enter><ctrl-p> displaying echo
'\\n'.
---
tc.func.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tc.func.c b/tc.func.c
index f2b1a97..97eda4e 100644
--- a/tc.func.c
+++ b/tc.func.c
@@ -120,8 +120,7 @@ expand_lex(const struct wordent *sp0, int from, int to)
if ((*s & QUOTE)
&& (((*s & TRIM) == HIST && HIST != '\0') ||
(((*s & TRIM) == '\'') && (prev_c != '\\')) ||
- (((*s & TRIM) == '\"') && (prev_c != '\\')) ||
- (((*s & TRIM) == '\\') && (prev_c != '\\')))) {
+ (((*s & TRIM) == '\"') && (prev_c != '\\')))) {
Strbuf_append1(&buf, '\\');
}
#if INVALID_BYTE != 0
--
2.5.5
From b1534dd442e5c1c6d662ea73d3324e10708790ff Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Fri, 13 May 2016 15:08:54 +0000
Subject: [PATCH 3/3] History expansion fix.
---
Fixes | 1 +
1 file changed, 1 insertion(+)
diff --git a/Fixes b/Fixes
index 8962302..ac899dd 100644
--- a/Fixes
+++ b/Fixes
@@ -1,3 +1,4 @@
+ 12. PR/526: Fix double \\ printing from previous fix in history expansion.
10. PR/526: Quote backslashes properly so they can be preserved in ``
expansions
9. Fix memory leak for paraml
--
2.5.5

5
tcsh.spec
View File

@ -1,7 +1,7 @@
Name: tcsh
Summary: An enhanced version of csh, the C shell
Version: 6.19.00
Release: 7%{?dist}
Release: 8%{?dist}
License: BSD
Group: System Environment/Shells
URL: http://www.tcsh.org/
@ -175,6 +175,9 @@ fi
%changelog
* Mon May 16 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-8
- Regression in tcsh-6.19.00-026-quote-backslashes-properly.patch fixed (#1333523)
* Tue May 3 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-7
- Adding multiple upstream patches to stay closer with upstream:
tcsh-6.19.00-000-announcement.patch