X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffclose.c;h=38e8a1e39dae99255328d97150180652afde9fb2;hb=1d92cddb1e1ed4b6cc0e55461727561e7a2522e0;hp=9481470de12777352763f15e5c0b5834b832466a;hpb=bd6746732536fdf2ebaadff6f98aee0879b1674d;p=musl diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c index 9481470d..38e8a1e3 100644 --- a/src/stdio/fclose.c +++ b/src/stdio/fclose.c @@ -3,18 +3,22 @@ int fclose(FILE *f) { int r; - int perm = f->flags & F_PERM; + int perm; + + FFINALLOCK(f); - if (!perm) { + if (!(perm = f->flags & F_PERM)) { OFLLOCK(); if (f->prev) f->prev->next = f->next; if (f->next) f->next->prev = f->prev; - if (ofl_head == f) ofl_head = f->next; + if (libc.ofl_head == f) libc.ofl_head = f->next; OFLUNLOCK(); } - r = -(fflush(f) || f->close(f)); + r = fflush(f); + r |= f->close(f); + if (f->getln_buf) free(f->getln_buf); if (!perm) free(f); return r;