Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-09 22:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing close-output-port to close underlying file descriptors when appropriate.

Browse source
This commit is contained in:
Alex Shinn 2014-02-12 00:25:02 +09:00
parent e22c03018a
commit 9651f7456c
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sexp.c
View file

@ -131,6 +131,14 @@ sexp sexp_write_simple_object (sexp ctx, sexp self, sexp_sint_t n, sexp obj, sex
#define sexp_write_simple_object NULL #define sexp_write_simple_object NULL
#endif #endif
sexp sexp_finalize_fileno (sexp ctx, sexp self, sexp_sint_t n, sexp fileno) {
if (sexp_fileno_openp(fileno) && !sexp_fileno_no_closep(fileno)) {
sexp_fileno_openp(fileno) = 0;
close(sexp_fileno_fd(fileno));
}
return SEXP_VOID;
}
sexp sexp_finalize_port (sexp ctx, sexp self, sexp_sint_t n, sexp port) { sexp sexp_finalize_port (sexp ctx, sexp self, sexp_sint_t n, sexp port) {
sexp res = SEXP_VOID; sexp res = SEXP_VOID;
if (sexp_port_openp(port)) { if (sexp_port_openp(port)) {
@ -146,6 +154,8 @@ sexp sexp_finalize_port (sexp ctx, sexp self, sexp_sint_t n, sexp port) {
if (sexp_oportp(port)) if (sexp_oportp(port))
shutdown(sexp_port_fileno(port), SHUT_WR); shutdown(sexp_port_fileno(port), SHUT_WR);
} }
if (!sexp_port_no_closep(port))
sexp_finalize_fileno(ctx, self, n, sexp_port_fd(port));
} }
#endif #endif
if (sexp_port_stream(port) && ! sexp_port_no_closep(port)) if (sexp_port_stream(port) && ! sexp_port_no_closep(port))
@ -164,14 +174,6 @@ sexp sexp_finalize_port (sexp ctx, sexp self, sexp_sint_t n, sexp port) {
return res; return res;
} }
sexp sexp_finalize_fileno (sexp ctx, sexp self, sexp_sint_t n, sexp fileno) {
if (sexp_fileno_openp(fileno) && !sexp_fileno_no_closep(fileno)) {
sexp_fileno_openp(fileno) = 0;
close(sexp_fileno_fd(fileno));
}
return SEXP_VOID;
}
#if SEXP_USE_DL #if SEXP_USE_DL
sexp sexp_finalize_dl (sexp ctx, sexp self, sexp_sint_t n, sexp dl) { sexp sexp_finalize_dl (sexp ctx, sexp self, sexp_sint_t n, sexp dl) {
dlclose(sexp_dl_handle(dl)); dlclose(sexp_dl_handle(dl));
@ -1616,6 +1618,7 @@ sexp sexp_make_fileno_op (sexp ctx, sexp self, sexp_sint_t n, sexp fd, sexp no_c
res = sexp_alloc_type(ctx, fileno, SEXP_FILENO); res = sexp_alloc_type(ctx, fileno, SEXP_FILENO);
if (!sexp_exceptionp(res)) { if (!sexp_exceptionp(res)) {
sexp_fileno_fd(res) = sexp_unbox_fixnum(fd); sexp_fileno_fd(res) = sexp_unbox_fixnum(fd);
sexp_fileno_openp(res) = 1;
sexp_fileno_no_closep(res) = sexp_truep(no_closep); sexp_fileno_no_closep(res) = sexp_truep(no_closep);
} }
return res; return res;