Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the -s flag of fc work correctly. Ensure that only one command is specified

Browse Source 
and ensure that we break out of the loop after executing it.
With the previous code, because the re-executed command was added to the
history, it would think that it still had to execute it, leading to an infinite
loop.

The last thing which differs from ksh is that we get the "fc -s " command into
the history, but this is actually rather a feature in my humble opinion.

To test:
$ echo hello
$ fc -s ec
<infinite loop or correct behaviour>
This commit is contained in:
aymeric 2006-03-06 00:09:22 +00:00
parent 32306cea7e
commit d5d0c11532
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/sh/histedit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: histedit.c,v 1.37 2005/07/15 17:49:43 christos Exp $ */
/* $NetBSD: histedit.c,v 1.38 2006/03/06 00:09:22 aymeric Exp $ */
/*-
* Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: histedit.c,v 1.37 2005/07/15 17:49:43 christos Exp $");
__RCSID("$NetBSD: histedit.c,v 1.38 2006/03/06 00:09:22 aymeric Exp $");
#endif
#endif /* not lint */
@ -336,6 +336,13 @@ histcmd(int argc, char **argv)
*repl++ = '\0';
argc--, argv++;
}
/*
* If -s is specified, accept only one operand
*/
if (sflg && argc >= 2)
error("too many args");
/*
* determine [first] and [last]
*/
@ -421,6 +428,8 @@ histcmd(int argc, char **argv)
*/
history(hist, &he, H_ENTER, s);
}
break;
} else
fputs(s, efp);
}