summaryrefslogtreecommitdiff
path: root/lib/decompress.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-10-24 21:14:39 +0100
committerColin Watson <cjwatson@debian.org>2010-10-24 21:14:39 +0100
commit68c6cde2e0377e45641ba14a77e0fdbb69e3aca6 (patch)
tree7c7e673730c2668e6d5679e94191eb7c41e28659 /lib/decompress.c
parentde47d728db30ec2db3e6b53b7c532b58de560aa3 (diff)
Make command and pipeline opaque types.
* lib/pipeline.c (command_nice, command_discard_err, pipeline_get_ncommands, pipeline_get_command, pipeline_set_command, pipeline_want_in, pipeline_want_out, pipeline_want_infile, pipeline_want_outfile, pipeline_ignore_signals): New functions. * lib/pipeline.h (command_nice, command_discard_err, pipeline_get_ncommands, pipeline_get_command, pipeline_set_command, pipeline_want_in, pipeline_want_out, pipeline_want_infile, pipeline_want_outfile, pipeline_ignore_signals): Add prototypes. * lib/pipeline.h (enum command_tag, struct command_env, struct command, struct pipeline): Move to ... * lib/pipeline.c (enum command_tag, struct command_env, struct command, struct pipeline): ... here. Redirections are now handled slightly differently internally, allowing redirection from/to fd 0. * lib/pipeline.c (pipeline_new, pipeline_join): Set redirect_in and redirect_out. (pipeline_connect): Use pipeline_want_in and pipeline_want_out. Check source->redirect_out. (pipeline_start): Handle new redirection semantics. * lib/decompress.c (decompress_open, decompress_fdopen): Use new accessor functions rather than accessing pipeline fields directly. * src/man.c (make_display_command, discard_stderr, open_cat_stream, format_display, display_catman, display): Likewise.
Diffstat (limited to 'lib/decompress.c')
-rw-r--r--lib/decompress.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/decompress.c b/lib/decompress.c
index fec3fa9b..293bb148 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -122,9 +122,9 @@ pipeline *decompress_open (const char *filename)
p = pipeline_new ();
got_pipeline:
- p->want_infile = filename;
- p->want_out = -1;
- p->ignore_signals = 0;
+ pipeline_want_infile (p, filename);
+ pipeline_want_out (p, -1);
+ pipeline_ignore_signals (p, 0);
return p;
}
@@ -142,8 +142,8 @@ pipeline *decompress_fdopen (int fd)
p = pipeline_new ();
#endif /* HAVE_LIBZ */
- p->want_in = fd;
- p->want_out = -1;
- p->ignore_signals = 0;
+ pipeline_want_in (p, fd);
+ pipeline_want_out (p, -1);
+ pipeline_ignore_signals (p, 0);
return p;
}