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

stop (ab)using the OS symbolic constant EOF, always use -1; plus misc fixes

Browse Source
This commit is contained in:
tg
2015-02-06 10:09:07 +00:00
parent f235766a3d
commit b94b2e363a
4 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.162 2015/02/06 09:33:41 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.163 2015/02/06 10:09:05 tg Exp $");
/*
* string expansion
@ -871,7 +871,7 @@ expand(
/* $(<...) failed */
subst_exstat = 1;
/* fake EOF */
c = EOF;
c = -1;
} else if (newlines) {
/* spit out saved NLs */
c = '\n';
@ -881,13 +881,13 @@ expand(
if (c == '\n')
/* save newlines */
newlines++;
if (newlines && c != EOF) {
if (newlines && c != -1) {
shf_ungetc(c, x.u.shf);
c = '\n';
--newlines;
}
}
if (c == EOF) {
if (c == -1) {
newlines = 0;
if (x.u.shf)
shf_close(x.u.shf);