Update RHEL-specific patch for 6.24.10
This commit is contained in:
parent
3689e32484
commit
b5d9062469
@ -22,14 +22,14 @@ Subject: [PATCH] downstream: implement variable tcsh_posix_status
|
|||||||
sh.proc.c | 2 +-
|
sh.proc.c | 2 +-
|
||||||
sh.set.c | 5 +++++
|
sh.set.c | 5 +++++
|
||||||
tc.const.c | 2 ++
|
tc.const.c | 2 ++
|
||||||
tests/variables.at | 28 ++++++++++++++++++++++++++++
|
tests/variables.at | 32 ++++++++++++++++++++++++++++++++
|
||||||
6 files changed, 39 insertions(+), 1 deletion(-)
|
6 files changed, 43 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/sh.c b/sh.c
|
diff --git a/sh.c b/sh.c
|
||||||
index e9dfa81..38d073a 100644
|
index e9dfa81..38d073a 100644
|
||||||
--- a/sh.c
|
--- a/sh.c
|
||||||
+++ b/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 */
|
anyerror = 1; /* for compatibility */
|
||||||
setcopy(STRanyerror, STRNULL, VAR_READWRITE);
|
setcopy(STRanyerror, STRNULL, VAR_READWRITE);
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ diff --git a/sh.h b/sh.h
|
|||||||
index 95f439d..a41e2e0 100644
|
index 95f439d..a41e2e0 100644
|
||||||
--- a/sh.h
|
--- a/sh.h
|
||||||
+++ b/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 noediting IZERO; /* initial $term defaulted to noedit */
|
||||||
EXTERN int bslash_quote IZERO;/* PWP: tcsh-style quoting? (in sh.c) */
|
EXTERN int bslash_quote IZERO;/* PWP: tcsh-style quoting? (in sh.c) */
|
||||||
EXTERN int anyerror IZERO; /* propagate errors from pipelines/backq */
|
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
|
index 0af5e03..ac6ef5d 100644
|
||||||
--- a/sh.proc.c
|
--- a/sh.proc.c
|
||||||
+++ b/sh.proc.c
|
+++ b/sh.proc.c
|
||||||
@@ -564,7 +564,7 @@ pjwait(struct process *pp)
|
@@ -560,7 +560,7 @@ pjwait(struct process *pp)
|
||||||
do {
|
do {
|
||||||
/* In case of pipelines only the result of the last
|
/* In case of pipelines only the result of the last
|
||||||
* command should be taken in account */
|
* command should be taken in account */
|
||||||
@ -67,7 +67,7 @@ diff --git a/sh.set.c b/sh.set.c
|
|||||||
index cf831b2..c155619 100644
|
index cf831b2..c155619 100644
|
||||||
--- a/sh.set.c
|
--- a/sh.set.c
|
||||||
+++ b/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)) {
|
else if (eq(vp, STRanyerror)) {
|
||||||
anyerror = 1;
|
anyerror = 1;
|
||||||
}
|
}
|
||||||
@ -77,7 +77,7 @@ index cf831b2..c155619 100644
|
|||||||
else if (eq(vp, STRsymlinks)) {
|
else if (eq(vp, STRsymlinks)) {
|
||||||
Char *pn = varval(vp);
|
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;
|
loginsh = 0;
|
||||||
if (adrof(STRanyerror) == 0)
|
if (adrof(STRanyerror) == 0)
|
||||||
anyerror = 0;
|
anyerror = 0;
|
||||||
@ -90,7 +90,7 @@ diff --git a/tc.const.c b/tc.const.c
|
|||||||
index cb39ab9..4fed182 100644
|
index cb39ab9..4fed182 100644
|
||||||
--- a/tc.const.c
|
--- a/tc.const.c
|
||||||
+++ b/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',
|
Char STRautomatic[] = { 'a', 'u', 't', 'o', 'm', 'a', 't', 'i', 'c',
|
||||||
'\0' };
|
'\0' };
|
||||||
Char STRanyerror[] = { 'a', 'n', 'y', 'e', 'r', 'r', 'o', 'r', '\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
|
index ffa0da2..5fa9239 100644
|
||||||
--- a/tests/variables.at
|
--- a/tests/variables.at
|
||||||
+++ b/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()
|
AT_CLEANUP()
|
||||||
|
|
||||||
|
|
||||||
|
+dnl
|
||||||
|
+dnl $ tcsh_posix_status
|
||||||
|
+dnl
|
||||||
|
+
|
||||||
+AT_SETUP([$ tcsh_posix_status])
|
+AT_SETUP([$ tcsh_posix_status])
|
||||||
+
|
+
|
||||||
+AT_DATA([exit_status.csh],
|
+AT_DATA([exit_status.csh],
|
||||||
@ -135,9 +139,9 @@ index ffa0da2..5fa9239 100644
|
|||||||
+AT_CLEANUP()
|
+AT_CLEANUP()
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
AT_SETUP([$ term])
|
dnl
|
||||||
|
dnl $ term
|
||||||
AT_DATA([term.csh],
|
dnl
|
||||||
--
|
--
|
||||||
2.7.4
|
2.7.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user