JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fourth time’s a charm… another bugfix related to the commitids

Browse Source 
1004BBDD84556472D84, 1004BBF77B81D30DA7C and 1004BBF7CD656308A1C
to unbreak kwalletcli
This commit is contained in:
tg 2010-04-20 09:10:07 +00:00
parent 14ea7e9038
commit 6e98fbe27b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.373 2010/04/09 19:16:29 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.374 2010/04/20 09:10:05 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -25,7 +25,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R39 2010/04/09 @(#)MIRBSD KSH R39 2010/04/20
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@ -1046,6 +1046,7 @@ stdin:
(echo -n '37 '; printf '<%s> ' ${v-a\ b} x ${v-c\ d}; echo .) 2>&- || echo failed in 37 (echo -n '37 '; printf '<%s> ' ${v-a\ b} x ${v-c\ d}; echo .) 2>&- || echo failed in 37
(echo 38 ${IFS+x'a'y} / "${IFS+x'a'y}" .) 2>&- || echo failed in 38 (echo 38 ${IFS+x'a'y} / "${IFS+x'a'y}" .) 2>&- || echo failed in 38
foo="x'a'y"; (echo 39 ${foo%*'a'*} / "${foo%*'a'*}" .) 2>&- || echo failed in 39 foo="x'a'y"; (echo 39 ${foo%*'a'*} / "${foo%*'a'*}" .) 2>&- || echo failed in 39
foo="a b c"; (echo -n '40 '; printf '<%s> ' "${foo#a}"; echo .) 2>&- || echo failed in 40
expected-stdout: expected-stdout:
1 }z 1 }z
2 ''z} 2 ''z}
@ -1086,6 +1087,7 @@ expected-stdout:
37 <a b> <x> <c d> . 37 <a b> <x> <c d> .
38 xay / x'a'y . 38 xay / x'a'y .
39 x' / x' . 39 x' / x' .
40 < b c> .
--- ---
name: expand-unglob-dblq name: expand-unglob-dblq
description: description:

4
eval.c
View File

@ -22,7 +22,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.86 2010/04/09 19:16:30 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.87 2010/04/20 09:10:07 tg Exp $");
/* /*
* string expansion * string expansion
@ -568,7 +568,7 @@ expand(const char *cp, /* input word */
sp++; /* ({) skip the } or x */ sp++; /* ({) skip the } or x */
tilde_ok = 0; /* in case of ${unset:-} */ tilde_ok = 0; /* in case of ${unset:-} */
*dp = '\0'; *dp = '\0';
quote = st->quotew; quote = st->quotep;
f = st->f; f = st->f;
if (f&DOBLANK) if (f&DOBLANK)
doblank--; doblank--;

4
sh.h
View File

@ -150,9 +150,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.388 2010/04/09 19:16:31 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.389 2010/04/20 09:10:07 tg Exp $");
#endif #endif
#define MKSH_VERSION "R39 2010/04/09" #define MKSH_VERSION "R39 2010/04/20"
#ifndef MKSH_INCLUDES_ONLY #ifndef MKSH_INCLUDES_ONLY