From f7942e319816ddff862017112aadc3f14fb73e81 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 21 Jun 2022 07:28:53 -0700 Subject: bugfix: missing gzip support in open-command. * stream.c (pipe_close_status_helper): New function, factored out of pipe_close and used by it, and also by gzio_close. (pipe_close): Call pipe_close, which now contains the classification of process wait status codes. (open_fileno): Now takes optional pid argument. If this specified, then make_pipevp_stream is used. (open_subprocess): Use the open_fileno function, rather than fopen. This simplifies things too, except that we have to catch exception. Pass pid to the newly added parameter of open_fileno so that we obtain a proper pipe stream that will wait for the process to terminate when closed. (mkstemp_wrap): Pass nil for pid argument of open_fileno. (stream_init): Update registration of open-fileno. * gzio.c (struct gzio_handle): New member, pid. (gzio_close): If there is a nonzero pid, wait for the process to terminate. (make_gzio_stream): Initialize h->pid to zero. (make_gzio_pipe_stream): New function. * parser.c (lino_fdopen): Pass nil for pid argument of open_fileno. * gzio.h (make_gzio_pipe_stream): Declared. * tests/018/gzip.tl: New test. --- stream.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'stream.h') diff --git a/stream.h b/stream.h index b735dd07..d54da38c 100644 --- a/stream.h +++ b/stream.h @@ -182,6 +182,8 @@ val make_tail_stream(FILE *, val descr); #if !HAVE_FORK_STUFF val make_pipe_stream(FILE *, val descr); #endif +val pipe_close_status_helper(val stream, val throw_on_error, + int status, val self); val stream_fd(val stream); #if HAVE_SOCKETS val make_sock_stream(FILE *f, val family, val type); @@ -246,7 +248,7 @@ struct strm_ctx *get_ctx(val stream); val get_string(val stream, val nchars, val close_after_p); val open_directory(val path); val open_file(val path, val mode_str); -val open_fileno(val fd, val mode_str); +val open_fileno(val fd, val mode_str, val pid_opt); val open_tail(val path, val mode_str, val seek_end_p); val open_command(val path, val mode_str); val path_search(val name, val path_in); -- cgit v1.2.3