mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-02 06:40:55 +01:00
Code Releases Activity

Merge of workers/{21131,21328}.

Browse source
This commit is contained in:
Paul Ackersviller 2007-05-03 04:28:50 +00:00
parent 333ee0195a
commit 22fbfe532b
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Src/init.c
View file

@ -112,7 +112,7 @@ loop(int toplevel, int justonce)
hbegin(1); /* init history mech */
if (isset(SHINSTDIN)) {
setblock_stdin();
if (interact) {
if (interact && toplevel) {
int hstop = stophist;
stophist = 3;
preprompt();
@ -308,14 +308,14 @@ parseargs(char **argv)
}
if (*argv) {
if (unset(SHINSTDIN)) {
argzero = *argv;
if (!cmd)
SHIN = movefd(open(unmeta(argzero), O_RDONLY | O_NOCTTY));
SHIN = movefd(open(unmeta(*argv), O_RDONLY | O_NOCTTY));
if (SHIN == -1) {
zerr("can't open input file: %s", argzero, 0);
exit(1);
zerr("can't open input file: %s", *argv, 0);
exit(127);
}
opts[INTERACTIVE] &= 1;
argzero = *argv;
argv++;
}
while (*argv)