midfavila/awk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Restore zoulas fixes, stages 2.

Browse Source
This commit is contained in:
Arnold D. Robbins 2020-02-06 22:32:55 +02:00
parent 5068d20ef6
commit cd552112a7
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
run.c
View File

@ -1820,30 +1820,31 @@ const char *filename(FILE *fp)
Cell *closefile(Node **a, int n) Cell *closefile(Node **a, int n)
{ {
Cell *x; Cell *x;
int i, stat; size_t i;
bool stat;
x = execute(a[0]); x = execute(a[0]);
getsval(x); getsval(x);
stat = -1; stat = true;
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
if (files[i].fname && strcmp(x->sval, files[i].fname) == 0) { if (!files[i].fname || strcmp(x->sval, files[i].fname) != 0)
continue;
if (ferror(files[i].fp)) if (ferror(files[i].fp))
FATAL("i/o error occurred on %s", files[i].fname); FATAL("i/o error occurred on %s", files[i].fname);
if (files[i].mode == '|' || files[i].mode == LE) if (files[i].mode == '|' || files[i].mode == LE)
stat = pclose(files[i].fp); stat = pclose(files[i].fp) == -1;
else else
stat = fclose(files[i].fp); stat = fclose(files[i].fp) == EOF;
if (stat == EOF) if (stat)
FATAL("i/o error occurred closing %s", files[i].fname); FATAL("i/o error occurred closing %s", files[i].fname);
if (i > 2) /* don't do /dev/std... */ if (i > 2) /* don't do /dev/std... */
xfree(files[i].fname); xfree(files[i].fname);
files[i].fname = NULL; /* watch out for ref thru this */ files[i].fname = NULL; /* watch out for ref thru this */
files[i].fp = NULL; files[i].fp = NULL;
} }
}
tempfree(x); tempfree(x);
x = gettemp(); x = gettemp();
setfval(x, (Awkfloat) stat); setfval(x, (Awkfloat) (stat ? -1 : 0));
return(x); return(x);
} }