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

• check.t: change history-e-minus-5 regression test to avoid false failure

Browse Source 
caused by ignoredups history control
• histrap.c: enable ignoredups after fc -s editing too
This commit is contained in:
tg
2008-09-30 19:36:16 +00:00
parent af7fcd2498
commit 9cd963ea45
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
check.t
View File

@@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.225 2008/09/30 18:43:06 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.226 2008/09/30 19:36:15 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 $
@@ -1850,15 +1850,17 @@ file-setup: file 644 "Env"
stdin: stdin:
echo abc def echo abc def
echo ghi jkl echo ghi jkl
:
fc -e - echo fc -e - echo
fc -l 2 4 fc -l 2 5
expected-stdout: expected-stdout:
abc def abc def
ghi jkl ghi jkl
ghi jkl ghi jkl
2 echo ghi jkl 2 echo ghi jkl
3 echo ghi jkl 3 :
4 fc -l 2 4 4 echo ghi jkl
5 fc -l 2 5
expected-stderr-pattern: expected-stderr-pattern:
/^X*echo ghi jkl\nX*$/ /^X*echo ghi jkl\nX*$/
--- ---

5
histrap.c
View File

@@ -3,7 +3,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.69 2008/09/30 19:25:51 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.70 2008/09/30 19:36:16 tg Exp $");
/*- /*-
* MirOS: This is the default mapping type, and need not be specified. * MirOS: This is the default mapping type, and need not be specified.
@@ -280,8 +280,7 @@ hist_execute(char *cmd)
if (!*q) /* ignore trailing newline */ if (!*q) /* ignore trailing newline */
q = NULL; q = NULL;
} }
/* setting ignoredups to true breaks history-e-minus-5 */ histsave(&hist_source->line, p, true, true);
histsave(&hist_source->line, p, true, false);
shellf("%s\n", p); /* POSIX doesn't say this is done... */ shellf("%s\n", p); /* POSIX doesn't say this is done... */
if ((p = q)) /* restore \n (trailing \n not restored) */ if ((p = q)) /* restore \n (trailing \n not restored) */