Accepting request 306382 from shells

- Update tcsh to patch level 6.18.05 - 20150510
 * fix reseting when interrupted inside an eval "eval sleep 10^C"
   (paulo.cesar.pereira.de.andrade)
 * rename handle_intr -> handle_interrupt as originally intended.
   fix input tests that need stdin on a tty

OBS-URL: https://build.opensuse.org/request/show/306382
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2015-05-15 07:54:54 +00:00 committed by Git OBS Bridge
commit d28e4932b9
5 changed files with 14 additions and 48 deletions

View File

@ -137,49 +137,6 @@
#ifdef LOGINFIRST
if (loginsh)
(void) srccat(varval(STRhome), STRsldotlogin);
--- sh.h
+++ sh.h 2015-05-05 07:20:23.946019208 +0000
@@ -580,7 +580,7 @@ EXTERN int neednote IZERO; /* Need to
EXTERN int noexec IZERO; /* Don't execute, just syntax check */
EXTERN int pjobs IZERO; /* want to print jobs if interrupted */
EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */
-EXTERN int handle_intr IZERO;/* Are we currently handling an interrupt? */
+EXTERN int handle_interrupt IZERO;/* Are we currently handling an interrupt? */
EXTERN int havhash IZERO; /* path hashing is available */
EXTERN int editing IZERO; /* doing filename expansion and line editing */
EXTERN int noediting IZERO; /* initial $term defaulted to noedit */
--- sh.print.c
+++ sh.print.c 2015-05-05 07:21:25.381518880 +0000
@@ -231,13 +231,13 @@ flush(void)
return;
if (GettingInput && !Tty_raw_mode && linp < &linbuf[sizeof linbuf - 10])
return;
- if (handle_intr)
+ if (handle_interrupt)
exitset = 1;
if (interrupted) {
interrupted = 0;
linp = linbuf; /* avoid recursion as stderror calls flush */
- if (handle_intr)
+ if (handle_interrupt)
fixerror();
else
stderror(ERR_SILENT);
@@ -298,11 +298,11 @@ flush(void)
case EDQUOT:
#endif
/* Nothing to do, but die */
- if (handle_intr == 0)
+ if (handle_interrupt == 0)
xexit(1);
/*FALLTHROUGH*/
default:
- if (handle_intr)
+ if (handle_interrupt)
fixerror();
else
stderror(ERR_SILENT);
--- tc.alloc.c
+++ tc.alloc.c 2015-05-04 14:29:30.000000000 +0000
@@ -514,7 +514,7 @@ smalloc(size_t n)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d4f8684c4773937f30cd1697f22d0d390c7ca8b1104392b02a9cfc732e3e418
size 946874

3
tcsh-6.18.05.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a739915946504fe5eacdfc0e4ddc6018e80a1b01b865720878315c02c35859f
size 947135

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon May 11 14:45:17 UTC 2015 - werner@suse.de
- Update tcsh to patch level 6.18.05 - 20150510
* fix reseting when interrupted inside an eval "eval sleep 10^C"
(paulo.cesar.pereira.de.andrade)
* rename handle_intr -> handle_interrupt as originally intended.
fix input tests that need stdin on a tty
-------------------------------------------------------------------
Tue May 5 10:16:14 UTC 2015 - werner@suse.de

View File

@ -17,13 +17,13 @@
Name: tcsh
Version: 6.18.04
Version: 6.18.05
Release: 0
Summary: The C SHell
License: BSD-3-Clause
Group: System/Shells
Url: http://www.tcsh.org/
Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.04.tar.gz
Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.05.tar.gz
Source2: bindkey.tcsh
Source3: complete.tcsh
Patch0: tcsh-6.18.03.dif