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

Update RHEL-specific patch for 6.24.10

Browse Source
This commit is contained in:
Yaakov Selkowitz 2023-05-12 12:08:43 -04:00
parent 3689e32484
commit b5d9062469
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tcsh-6.20.00-tcsh-posix-status.patch
View File

@ -22,14 +22,14 @@ Subject: [PATCH] downstream: implement variable tcsh_posix_status
sh.proc.c | 2 +-
sh.set.c | 5 +++++
tc.const.c | 2 ++
tests/variables.at | 28 ++++++++++++++++++++++++++++
6 files changed, 39 insertions(+), 1 deletion(-)
tests/variables.at | 32 ++++++++++++++++++++++++++++++++
6 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/sh.c b/sh.c
index e9dfa81..38d073a 100644
--- a/sh.c
+++ b/sh.c
@@ -357,6 +357,8 @@ main(int argc, char **argv)
@@ -356,6 +356,8 @@ main(int argc, char **argv)
anyerror = 1; /* for compatibility */
setcopy(STRanyerror, STRNULL, VAR_READWRITE);
@ -42,7 +42,7 @@ diff --git a/sh.h b/sh.h
index 95f439d..a41e2e0 100644
--- a/sh.h
+++ b/sh.h
@@ -573,6 +573,7 @@ EXTERN int editing IZERO; /* doing filename expansion and line editing */
@@ -576,6 +576,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 */
@ -54,7 +54,7 @@ diff --git a/sh.proc.c b/sh.proc.c
index 0af5e03..ac6ef5d 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -564,7 +564,7 @@ pjwait(struct process *pp)
@@ -560,7 +560,7 @@ pjwait(struct process *pp)
do {
/* In case of pipelines only the result of the last
* command should be taken in account */
@ -67,7 +67,7 @@ diff --git a/sh.set.c b/sh.set.c
index cf831b2..c155619 100644
--- a/sh.set.c
+++ b/sh.set.c
@@ -117,6 +117,9 @@ update_vars(Char *vp)
@@ -113,6 +113,9 @@ update_vars(Char *vp)
else if (eq(vp, STRanyerror)) {
anyerror = 1;
}
@ -77,7 +77,7 @@ index cf831b2..c155619 100644
else if (eq(vp, STRsymlinks)) {
Char *pn = varval(vp);
@@ -788,6 +791,8 @@ unset(Char **v, struct command *c)
@@ -783,6 +786,8 @@ unset(Char **v, struct command *c)
loginsh = 0;
if (adrof(STRanyerror) == 0)
anyerror = 0;
@ -90,7 +90,7 @@ diff --git a/tc.const.c b/tc.const.c
index cb39ab9..4fed182 100644
--- a/tc.const.c
+++ b/tc.const.c
@@ -44,6 +44,8 @@ Char STRrootdefautologout[] = { '1', '5', '\0' };
@@ -41,6 +41,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' };
@ -103,10 +103,14 @@ diff --git a/tests/variables.at b/tests/variables.at
index ffa0da2..5fa9239 100644
--- a/tests/variables.at
+++ b/tests/variables.at
@@ -976,6 +976,34 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], ,
@@ -1490,6 +1490,38 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], ,
AT_CLEANUP()
+dnl
+dnl $ tcsh_posix_status
+dnl
+
+AT_SETUP([$ tcsh_posix_status])
+
+AT_DATA([exit_status.csh],
@ -135,9 +139,9 @@ index ffa0da2..5fa9239 100644
+AT_CLEANUP()
+
+
AT_SETUP([$ term])
AT_DATA([term.csh],
dnl
dnl $ term
dnl
--
2.7.4