pool/tcsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 738215 from shells

Browse Source 
- Fix patch tcsh-6.18.01-history-stderror-jmp.patch to avoid
  breaks in sourcing standard system files (boo#1153839)

OBS-URL: https://build.opensuse.org/request/show/738215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2019-10-17 10:17:32 +00:00 committed by Git OBS Bridge
commit 8bf1a256fd
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tcsh-6.18.01-history-stderror-jmp.patch
View File

@ -25,25 +25,32 @@
} }
cleanup_push(&unit, open_cleanup); cleanup_push(&unit, open_cleanup);
@@ -2229,6 +2231,7 @@ dosource_flg(Char **t, struct command *c @@ -2225,7 +2227,7 @@ dosource(Char **t, struct command *c)
int
dosource_flg(Char **t, struct command *c, int flg)
{
- Char *f;
+ Char *f, **globbed;
char *file; char *file;
int fd; int fd;
int newflg = 0; int newflg = 0;
+ size_t omark; @@ -2248,12 +2253,17 @@ dosource_flg(Char **t, struct command *c
cleanup_push(file, xfree);
USE(c);
t++;
@@ -2249,9 +2252,12 @@ dosource_flg(Char **t, struct command *c
xfree(f); xfree(f);
t = glob_all_or_error(t); t = glob_all_or_error(t);
cleanup_push(t, blk_cleanup); - cleanup_push(t, blk_cleanup);
+ omark = cleanup_push_mark(); + globbed = t;
+ cleanup_push(globbed, blk_cleanup);
fd = srcfile(file, 0, (flg | newflg), t); fd = srcfile(file, 0, (flg | newflg), t);
- if ((!fd) && (!newflg) && (!bequiet)) - if ((!fd) && (!newflg) && (!bequiet))
+ if ((!fd) && (!newflg) && (!bequiet)) { + if ((!fd) && (!newflg) && (!bequiet)) {
+ omark = cleanup_push_mark(); + (void)cleanup_push_mark();
stderror(ERR_SYSTEM, file, strerror(errno)); stderror(ERR_SYSTEM, file, strerror(errno));
+ } + }
/* We need to preserve fd and it's cleaning routines on the top of the /* We need to preserve fd and it's cleaning routines on the top of the
* cleaning stack. Don't call cleanup_until() but clean it manually. */ * cleaning stack. Don't call cleanup_until() but clean it manually. */
+ cleanup_ignore(globbed);
+ blk_cleanup(globbed);
cleanup_ignore(file); cleanup_ignore(file);
xfree(file);

2
tcsh-6.18.03-history-merge.dif
View File

@ -40,7 +40,7 @@
} }
#define USE_JENKINS_HASH 1 #define USE_JENKINS_HASH 1
@@ -1353,5 +1353,16 @@ void @@ -1358,5 +1358,16 @@ void
sethistory(int n) sethistory(int n)
{ {
histlen = n; histlen = n;

6
tcsh.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 14 08:34:04 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Fix patch tcsh-6.18.01-history-stderror-jmp.patch to avoid
breaks in sourcing standard system files (boo#1153839)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 26 07:39:20 UTC 2019 - Dr. Werner Fink <werner@suse.de> Thu Sep 26 07:39:20 UTC 2019 - Dr. Werner Fink <werner@suse.de>