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

Regression in escaping of aliases fixed, git completion should work again.

Browse Source 
See more info at:    <https://bugzilla.redhat.com/show_bug.cgi?id=1334751#c9>
  Upstream discussion: <mx.gw.com/pipermail/tcsh-bugs/2a016-May/001049.html>
This commit is contained in:
David Kaspar [Dee'Kej] 2016-05-27 15:59:32 +02:00
parent 4fa96ac104
commit 9757dff036
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
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 1/3] PR/526: David Kaspar: Quote backslashes properly so that they
Subject: [PATCH 1/4] PR/526: David Kaspar: Quote backslashes properly so that they
can be preserved in `` expansions.
---
@ -55,7 +55,7 @@ index 8a6d1b0..eae8a03 100644
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
Subject: [PATCH 2/4] 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'.
@ -84,7 +84,7 @@ index f2b1a97..97eda4e 100644
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.
Subject: [PATCH 3/4] History expansion fix.
---
Fixes | 1 +
@ -102,3 +102,41 @@ index 8962302..ac899dd 100644
--
2.5.5
From 819ab9146f10a3eae77098769210e1751cb7d494 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Tue, 24 May 2016 19:29:19 +0000
Subject: [PATCH 4/4] set myvar=`\echo 1 2 3`
and
set myvar=`echo 1 2 3`
should produce the same result for:
$ echo ${myvar[1]}
1
Don't treat the first character of the string specially. If the whole string
is quoted, then we are quoted, otherwise not.
---
sh.glob.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sh.glob.c b/sh.glob.c
index 895a603..8279802 100644
--- a/sh.glob.c
+++ b/sh.glob.c
@@ -708,7 +708,12 @@ backeval(struct blk_buf *bb, struct Strbuf *word, Char *cp, int literal)
hadnl = 0;
icnt = 0;
- quoted = (literal || (cp[0] & QUOTE)) ? QUOTE : 0;
+ if (!literal) {
+ for (ip = cp; (*ip & QUOTE) != 0; ip++)
+ continue;
+ quoted = *ip == '\0';
+ } else
+ quoted = literal;
faket.t_dtyp = NODE_COMMAND;
faket.t_dflg = F_BACKQ;
faket.t_dlef = 0;
--
2.5.5

6
tcsh.spec
View File

@ -1,7 +1,7 @@
Name: tcsh
Summary: An enhanced version of csh, the C shell
Version: 6.19.00
Release: 8%{?dist}
Release: 9%{?dist}
License: BSD
Group: System Environment/Shells
URL: http://www.tcsh.org/
@ -175,6 +175,10 @@ fi
%changelog
* Fri May 27 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-9
- Another regression in tcsh-6.19.00-026-quote-backslashes-properly.patch fixed, see:
<https://bugzilla.redhat.com/show_bug.cgi?id=1334751#c9>
* 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)