Compare commits

...

29 Commits

Author SHA1 Message Date
David Kaspar [Dee'Kej] 04ec98ea80 WARNING: This branch is *DEAD*, do not use it! 2016-05-16 13:10:02 +02:00
David Kaspar [Dee'Kej] 044d7322c9 tcsh-6.19.00-028-fix-wrong-ifdef.patch
> Fix wrong ifdef (Corinna Vinschen)
2016-05-03 17:08:55 +02:00
David Kaspar [Dee'Kej] bee9ff3eaa tcsh-6.19.00-027-fix-memory-leak-when-cdpath-fails.patch added
> fix memory leak when cdpath fails to find a matching path (David Kaspar)
2016-05-03 17:06:41 +02:00
David Kaspar [Dee'Kej] 68ac8c7562 tcsh-6.19.00-026-quote-backslashes-properly.patch added
Related to BZ: #1301857
  > PR/526: David Kaspar: Quote backslashes properly so that they can be
  > preserved in `` expansions.
2016-05-03 17:01:02 +02:00
David Kaspar [Dee'Kej] c52c66dd8f tcsh-6.19.00-025-more-generous-ROUNDUP-_LP64.patch added
> More generous ROUNDUP for _LP64
2016-05-03 16:59:22 +02:00
David Kaspar [Dee'Kej] 5aae8dd7aa tcsh-6.19.00-024-use-sysmalloc.patch added
This will force tcsh to use system malloc instead of builtin malloc,
  and is related to BZ: #1303323

  > Detect __GLIBC__ so it uses sysmalloc from <features.h>
  > https://bugzilla.redhat.com/show_bug.cgi?id=1303323
2016-05-03 16:50:26 +02:00
David Kaspar [Dee'Kej] e0c9a87afd tcsh-6.19.00-023-fix-debugging-code.patch added
> PR/510: Masanarid Iida: Add missing paren (in debugging code)
  > PR/510: Masanari Iida: Fix debugging printfs.
2016-05-03 16:47:17 +02:00
David Kaspar [Dee'Kej] 0ace13afc3 tcsh-6.19.00-022-fix-source-command-memory-leak.patch added
Fixes memory leak when using source command. Related to BZ: #1134132

  > make backeval use its own paraml
  > introduce initlex() and call freelex() before calling lex()
  > Call initlex() sooner, instead of hand-crafted code.
  > Initialize word in initlex()
2016-05-03 16:39:46 +02:00
David Kaspar [Dee'Kej] c2e33e4ddf Additional upstream commit added to tcsh-6.19.00-002-fix-error-messages.patch
This is related to commit: 0ded4c4fc5
2016-05-03 16:22:41 +02:00
David Kaspar [Dee'Kej] dc0932afbb tcsh-6.19.00-021-remove-extra-semicolon.patch added
> Remove extra ;
2016-05-03 16:13:33 +02:00
David Kaspar [Dee'Kej] a1d396cced tcsh-6.19.00-020-make-heredoc-interruptible-again.patch added
> Make heredoc interruptible again (Mike Sullivan)
2016-05-03 16:08:25 +02:00
David Kaspar [Dee'Kej] 3a8b3e89bb tcsh-6.19.00-019-fix-uninitialized-estr.patch added
> Fix uninitialized estr (Holger Seidel)
2016-05-03 16:08:25 +02:00
David Kaspar [Dee'Kej] eaf691a431 tcsh-6.19.00-018-add-noclobber-and-ask-options.patch added
> add noclobber/ask options (Martin Tournoij)
2016-05-03 16:08:25 +02:00
David Kaspar [Dee'Kej] 5a4286b3d8 tcsh-6.19.00-017-fix-for-finnish-translations.patch added
> Add/fix some translations.
2016-05-03 16:08:20 +02:00
David Kaspar [Dee'Kej] 9cdc5a7014 tcsh-6.19.00-016-do-not-quote-name-expanded-by-completion.patch added
> don't quote the expanded by completion name otherwise
  > "echo $vers<tab><return>" prints Illegal variable name.
2016-05-03 15:42:51 +02:00
David Kaspar [Dee'Kej] 5a65791fd7 tcsh-6.19.00-015-set-LC_COLLATE-to-C-and-add-HTML-makefile.patch added
> Set LC_COLLATE=C when calling sort for reproducible results.
  > Add a Makefile for creating the HTML version of the manual page.
2016-05-03 14:50:13 +02:00
David Kaspar [Dee'Kej] 5a40f8bd7b tcsh-6.19.00-014-do-not-use-union-wait.patch added
> GLIBC is getting rid of union wait.
2016-05-03 14:42:29 +02:00
David Kaspar [Dee'Kej] dd868bad11 tcsh-6.19.00-013-VImode-variable-provided.patch added
> Fix the word boundary handling of vi-eword...
  > Provide shell variable $vimode to control VImode.
  > If VImode=1, use "_" as the default for $wordchars, to match vi's default.
  > Modify c_to_class() to use isword().
  > rename e_capitolcase ->e_capitalcase (Luke Mewburn)
  > Fix e_capitolcase to e_capitalcase
2016-05-03 14:26:50 +02:00
David Kaspar [Dee'Kej] 8c3389d789 tcsh-6.19.00-012-display-default-in-editor.patch added
> display the default compiled in editor with bindkey -d (Luke Mewburn)
2016-05-03 14:07:45 +02:00
David Kaspar [Dee'Kej] b35b8fde49 tcsh-6.19.00-011-man-page-spelling-fixes.patch added
> Spelling fixes.
2016-05-03 13:57:43 +02:00
David Kaspar [Dee'Kej] 99de7449e5 tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.patch added
> Fix comparison of $EDITOR or $VISUAL against names of background
  > processes so that it doesn't just prefix match.

  > Rework run-fg-editor to use $editors exclusively if its set, and
  > ignore the use of $EDITOR (default "ed") and $VISUAL (default "vi").
2016-05-03 13:43:56 +02:00
David Kaspar [Dee'Kej] cbef8bec87 tcsh-6.19.00-009-fix-parsing-of-if-statement.patch added
> Fix parsing of if statement with a missing space after the if closing
  > parenthesis (Fridolin Pokorny)
2016-05-03 13:36:13 +02:00
David Kaspar [Dee'Kej] e80689df77 tcsh-6.19.00-008-fix-ln-1-completion.patch added
> Fix ln(1) completion.
2016-05-03 13:36:13 +02:00
David Kaspar [Dee'Kej] 82f4d2147e tcsh-6.19.00-007-fix-handling-of-invalid-unicode-characters.patch added
> PR/437: Fix handling of invalid unicode characters.
2016-05-03 13:36:13 +02:00
David Kaspar [Dee'Kej] 7c359e3eae tcsh-6.19.00-006-_SIGWINCH-added.patch added
> Added _SIGWINCH
2016-05-03 13:36:06 +02:00
David Kaspar [Dee'Kej] e744b47351 tcsh-6.19.00-005-ge0-is-always-true-for-unsigned.patch added
> >= 0 is always true if unsigned (c11 allows wint_t to be unsigned),
  > and we handle the 0 case above anyway.
2016-05-03 13:35:42 +02:00
David Kaspar [Dee'Kej] 6c924c648c tcsh-6.19.00-004-remove-unused-variable.patch added
> remove unused variable.
2016-05-03 13:35:10 +02:00
David Kaspar [Dee'Kej] 12f06f3278 tcsh-6.19.00-003-avoid-gcc5-calloc-optimization.patch added
> avoid gcc-5 optimization malloc + memset = calloc (Fridolin Pokorny)
2016-05-03 12:41:14 +02:00
David Kaspar [Dee'Kej] 0ded4c4fc5 tcsh-6.19.00-002-fix-error-messages.patch added
> PR/451: Fix error messages containing %c to be always '%c'
2016-05-03 12:32:56 +02:00
7 changed files with 57 additions and 271 deletions

3
README Normal file
View File

@ -0,0 +1,3 @@
This git branch used to be auxiliary for creating tcsh-6.19.00-07.
This is now a *DEAD BRANCH* that should not be used anymore!

View File

@ -1,49 +0,0 @@
From e14e62c9353e3e1d0583c549cd7ef23ab9417083 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Thu, 21 May 2015 21:50:25 +0000
Subject: [PATCH] announcement for 6.19.00
---
Announce-6.19.00 | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 Announce-6.19.00
diff --git a/Announce-6.19.00 b/Announce-6.19.00
new file mode 100644
index 0000000..c12d1b4
--- /dev/null
+++ b/Announce-6.19.00
@@ -0,0 +1,30 @@
+Hello,
+
+I am pleased to announce that tcsh-6.19 is now available; this is a mainly a
+bug fix release (after 3 years) with few new features:
+
+ 1. new cdtohome variable
+ 2. locking in history files
+ 3. history speedups.
+
+Please consult the Fixes files for a complete list of changes.
+
+Tcsh is an enhanced version of the Berkeley C-shell that offers command
+line editing and completion plus many other little things that preserve
+the length of your fingers.
+
+Tcsh runs on most UNIX machines, VMS_POSIX, OS/2 EMX, WIN32, Amiga...
+
+You can get tcsh from ftp://ftp.astron.com/pub/tcsh/tcsh-6.19.00.tar.gz
+
+RMD160 (tcsh-6.19.00.tar.gz) = 0f1e8c5fdee634baff6670290bd30074db965da3
+
+This is a gzip (GNU zip) tar archive. If you don't have GNU zip you can
+get it from ftp.gnu.org or other GNU mirrors.
+
+I would like to thank:
+
+ * everyone who sent bug reports
+ * the beta team for all their help, bug fixes, and suggestions
+
+christos
--
2.5.5

View File

@ -1,25 +0,0 @@
From 0ec81072bff28befe1337612d4ec7a2d12028c9d Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Tue, 26 May 2015 11:59:47 +0000
Subject: [PATCH] Remove CFLAGS for gethost to ease cross-compilation
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index b557cfa..bfe51b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -449,7 +449,7 @@ pure:$(P) ${OBJS}
gethost: gethost.c sh.err.h tc.const.h sh.h
rm -f gethost
- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c
+ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
tc.defs.c: gethost host.defs
@rm -f $@.tmp
--
2.5.5

View File

@ -1,18 +0,0 @@
diff --git a/tc.alloc.c b/tc.alloc.c
index b87f9e9..06e0405 100644
--- a/tc.alloc.c
+++ b/tc.alloc.c
@@ -348,10 +348,12 @@ calloc(size_t i, size_t j)
{
#ifndef lint
char *cp;
+ volatile size_t k;
i *= j;
cp = xmalloc(i);
- memset(cp, 0, i);
+ k = i;
+ memset(cp, 0, k);
return ((memalign_t) cp);
#else

View File

@ -1,26 +0,0 @@
From 87ee44842faf55de9c52cff06a6e0f54c4fc5a0f Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Fri, 29 Apr 2016 16:52:59 +0200
Subject: [PATCH] Inform about no support for 'limit memoryuse' in manpage
This patch has been introduced after request in BZ: #247637
---
tcsh.man | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tcsh.man b/tcsh.man
index b79bafe..b70fe14 100644
--- a/tcsh.man
+++ b/tcsh.man
@@ -2945,6 +2945,8 @@ the size of the largest core dump that will be created
\fImemoryuse\fR
the maximum amount of physical memory a process
may have allocated to it at a given time
+
+NOTE: Changing this value has no effect. Support has been removed from Linux kernel v2.6 and newer.
.TP
\fIvmemoryuse\fR
the maximum amount of virtual memory a process
--
2.5.5

View File

@ -1,151 +0,0 @@
From b31ff7ce0ae4b221b54e329e44d4df1e9b337c40 Mon Sep 17 00:00:00 2001
From: David Kaspar [Dee'Kej] <dkaspar@redhat.com>
Date: Tue, 26 Apr 2016 16:58:15 +0200
Subject: [PATCH] tcsh-6.19.00-tcsh_posix_status-deprecated.patch
---
sh.c | 2 ++
sh.h | 1 +
sh.proc.c | 2 +-
sh.set.c | 16 ++++++++++++++++
tc.const.c | 2 ++
tests/variables.at | 31 +++++++++++++++++++++++++++++++
6 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/sh.c b/sh.c
index b760f04..242556a 100644
--- a/sh.c
+++ b/sh.c
@@ -355,6 +355,8 @@ main(int argc, char **argv)
anyerror = 1; /* for compatibility */
setcopy(STRanyerror, STRNULL, VAR_READWRITE);
+ tcsh_posix_status = 0;
+
/* Default history size to 100 */
setcopy(STRhistory, str2short("100"), VAR_READWRITE);
sethistory(100);
diff --git a/sh.h b/sh.h
index 608fc99..c0a5f0b 100644
--- a/sh.h
+++ b/sh.h
@@ -568,6 +568,7 @@ EXTERN int editing IZERO; /* doing filename expansion and line editing */
EXTERN int noediting IZERO; /* initial $term defaulted to noedit */
EXTERN int bslash_quote IZERO;/* PWP: tcsh-style quoting? (in sh.c) */
EXTERN int anyerror IZERO; /* propagate errors from pipelines/backq */
+EXTERN int tcsh_posix_status IZERO; /* negation for anyerror */
EXTERN int compat_expr IZERO;/* csh-style expressions? */
EXTERN int isoutatty IZERO; /* is SHOUT a tty */
EXTERN int isdiagatty IZERO;/* is SHDIAG a tty */
diff --git a/sh.proc.c b/sh.proc.c
index ce37c4d..2ffdee0 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -561,7 +561,7 @@ pjwait(struct process *pp)
do {
/* In case of pipelines only the result of the last
* command should be taken in account */
- if (!anyerror && !(fp->p_flags & PBRACE)
+ if ((!anyerror || tcsh_posix_status) && !(fp->p_flags & PBRACE)
&& ((fp->p_flags & PPOU) || (fp->p_flags & PBACKQ)))
continue;
if (fp->p_reason)
diff --git a/sh.set.c b/sh.set.c
index 7498169..090129c 100644
--- a/sh.set.c
+++ b/sh.set.c
@@ -41,6 +41,8 @@ RCSID("$tcsh: sh.set.c,v 3.86 2014/10/28 18:40:46 christos Exp $")
#include <langinfo.h>
#endif
+#include <stdio.h>
+
extern int GotTermCaps;
int numeof = 0;
@@ -109,6 +111,18 @@ update_vars(Char *vp)
else if (eq(vp, STRanyerror)) {
anyerror = 1;
}
+ else if (eq(vp, STRtcsh_posix_status)) {
+ static error_msg_printed = 0;
+
+ if (error_msg_printed == 0) {
+ fprintf(stderr, "tcsh: Warning: 'tcsh_posix_status' variable is"
+ " deprecated and will be removed in Fedora 25\n"
+ "tcsh: Note: Use 'anyerror' variable instead\n");
+ error_msg_printed = 1;
+ }
+
+ tcsh_posix_status = 1;
+ }
else if (eq(vp, STRsymlinks)) {
Char *pn = varval(vp);
@@ -774,6 +788,8 @@ unset(Char **v, struct command *c)
loginsh = 0;
if (adrof(STRanyerror) == 0)
anyerror = 0;
+ if (adrof(STRtcsh_posix_status) == 0)
+ tcsh_posix_status = 0;
if (adrof(STRwordchars) == 0)
word_chars = STR_WORD_CHARS;
if (adrof(STRedit) == 0)
diff --git a/tc.const.c b/tc.const.c
index e71d2ae..f383714 100644
--- a/tc.const.c
+++ b/tc.const.c
@@ -44,6 +44,8 @@ Char STRrootdefautologout[] = { '1', '5', '\0' };
Char STRautomatic[] = { 'a', 'u', 't', 'o', 'm', 'a', 't', 'i', 'c',
'\0' };
Char STRanyerror[] = { 'a', 'n', 'y', 'e', 'r', 'r', 'o', 'r', '\0' };
+Char STRtcsh_posix_status[] = {'t', 'c', 's', 'h', '_', 'p', 'o', 's', 'i', 'x',
+ '_', 's', 't', 'a', 't', 'u', 's', '\0' };
Char STRhangup[] = { 'h', 'a', 'n', 'g', 'u', 'p', '\0' };
Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' };
Char STRtty[] = { 't', 't', 'y', '\0' };
diff --git a/tests/variables.at b/tests/variables.at
index fabe7ab..9b2376e 100644
--- a/tests/variables.at
+++ b/tests/variables.at
@@ -970,6 +970,37 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], ,
AT_CLEANUP
+AT_SETUP([$ tcsh_posix_status])
+
+AT_DATA([exit_status.csh],
+[[echo $?tcsh_posix_status
+false | true ; echo $?
+set tcsh_posix_status = 1 ; echo $?tcsh_posix_status $tcsh_posix_status
+false | true ; echo $?
+set tcsh_posix_status = 0 ; echo $?tcsh_posix_status $tcsh_posix_status
+# Note it is still set!
+false | true ; echo $?
+unset tcsh_posix_status ; echo $?tcsh_posix_status
+false | true ; echo $?
+]])
+
+AT_CHECK([tcsh -f exit_status.csh],,
+[0
+1
+1 1
+0
+1 0
+0
+0
+1
+],
+[tcsh: Warning: 'tcsh_posix_status' variable is deprecated and will be removed in Fedora 25
+tcsh: Note: Use 'anyerror' variable instead
+])
+
+AT_CLEANUP
+
+
AT_SETUP([$ term])
AT_DATA([term.csh],
--
2.5.5

View File

@ -30,6 +30,33 @@ Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.tar.gz
# ---------------- last rebase that are necessary for any reason:
Patch000: tcsh-6.19.00-000-announcement.patch
Patch001: tcsh-6.19.00-001-remove-CFLAGS-for-gethost.patch
Patch002: tcsh-6.19.00-002-fix-error-messages.patch
Patch003: tcsh-6.19.00-003-avoid-gcc5-calloc-optimization.patch
Patch004: tcsh-6.19.00-004-remove-unused-variable.patch
Patch005: tcsh-6.19.00-005-ge0-is-always-true-for-unsigned.patch
Patch006: tcsh-6.19.00-006-_SIGWINCH-added.patch
Patch007: tcsh-6.19.00-007-fix-handling-of-invalid-unicode-characters.patch
Patch008: tcsh-6.19.00-008-fix-ln-1-completion.patch
Patch009: tcsh-6.19.00-009-fix-parsing-of-if-statement.patch
Patch010: tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.patch
Patch011: tcsh-6.19.00-011-man-page-spelling-fixes.patch
Patch012: tcsh-6.19.00-012-display-default-in-editor.patch
Patch013: tcsh-6.19.00-013-VImode-variable-provided.patch
Patch014: tcsh-6.19.00-014-do-not-use-union-wait.patch
Patch015: tcsh-6.19.00-015-set-LC_COLLATE-to-C-and-add-HTML-makefile.patch
Patch016: tcsh-6.19.00-016-do-not-quote-name-expanded-by-completion.patch
Patch017: tcsh-6.19.00-017-fix-for-finnish-translations.patch
Patch018: tcsh-6.19.00-018-add-noclobber-and-ask-options.patch
Patch019: tcsh-6.19.00-019-fix-uninitialized-estr.patch
Patch020: tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
Patch021: tcsh-6.19.00-021-remove-extra-semicolon.patch
Patch022: tcsh-6.19.00-022-fix-source-command-memory-leak.patch
Patch023: tcsh-6.19.00-023-fix-debugging-code.patch
Patch024: tcsh-6.19.00-024-use-sysmalloc.patch
Patch025: tcsh-6.19.00-025-more-generous-ROUNDUP-_LP64.patch
Patch026: tcsh-6.19.00-026-quote-backslashes-properly.patch
Patch027: tcsh-6.19.00-027-fix-memory-leak-when-cdpath-fails.patch
Patch028: tcsh-6.19.00-028-fix-wrong-ifdef.patch
# Downstream patches -- these should be always included when doing rebase:
@ -39,10 +66,8 @@ Patch100: tcsh-6.19.00-manpage-memoryuse.patch
# Patches to be removed -- deprecated functionality which shall be removed at
# --------------------- some point in the future:
Patch101: tcsh-6.19.00-gcc5-calloc.patch
Patch102: tcsh-6.19.00-tcsh_posix_status-deprecated.patch
# NOTE: Patch101 has been accepted by upstream - http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000944.html
# NOTE: Patch102 should be removed in Fedora 25!
@ -154,6 +179,33 @@ fi
- Adding multiple upstream patches to stay closer with upstream:
tcsh-6.19.00-000-announcement.patch
tcsh-6.19.00-001-remove-CFLAGS-for-gethost.patch
tcsh-6.19.00-002-fix-error-messages.patch
tcsh-6.19.00-003-avoid-gcc5-calloc-optimization.patch (replaces tcsh-6.19.00-gcc5-calloc.patch)
tcsh-6.19.00-004-remove-unused-variable.patch
tcsh-6.19.00-005-ge0-is-always-true-for-unsigned.patch
tcsh-6.19.00-006-_SIGWINCH-added.patch
tcsh-6.19.00-007-fix-handling-of-invalid-unicode-characters.patch
tcsh-6.19.00-008-fix-ln-1-completion.patch
tcsh-6.19.00-009-fix-parsing-of-if-statement.patch
tcsh-6.19.00-010-fix-editor-and-visual-variables-and-its-behaviour.patch
tcsh-6.19.00-011-man-page-spelling-fixes.patch
tcsh-6.19.00-012-display-default-in-editor.patch
tcsh-6.19.00-013-VImode-variable-provided.patch
tcsh-6.19.00-014-do-not-use-union-wait.patch
tcsh-6.19.00-015-set-LC_COLLATE-to-C-and-add-HTML-makefile.patch
tcsh-6.19.00-016-do-not-quote-name-expanded-by-completion.patch
tcsh-6.19.00-017-fix-for-finnish-translations.patch
tcsh-6.19.00-018-add-noclobber-and-ask-options.patch
tcsh-6.19.00-019-fix-uninitialized-estr.patch
tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
tcsh-6.19.00-021-remove-extra-semicolon.patch
tcsh-6.19.00-022-fix-source-command-memory-leak.patch
tcsh-6.19.00-023-fix-debugging-code.patch
tcsh-6.19.00-024-use-sysmalloc.patch
tcsh-6.19.00-025-more-generous-ROUNDUP-_LP64.patch
tcsh-6.19.00-026-quote-backslashes-properly.patch
tcsh-6.19.00-027-fix-memory-leak-when-cdpath-fails.patch
tcsh-6.19.00-028-fix-wrong-ifdef.patch
* Thu Apr 21 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-6
- Drop tcsh-6.15.00-closem.patch - issue not reproducible, patch not accepted by upstream