diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-11-26 21:40:17 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-11-26 21:40:17 +0000 |
commit | 0334f84d7012e2930aa3d735e3c95f156bb3a679 (patch) | |
tree | 3e73211ed643468e16f996cb81015f698177c744 /read.c | |
parent | 6b21541c4f687461a2efa734f27f3451da3030f8 (diff) | |
download | mandoc-0334f84d7012e2930aa3d735e3c95f156bb3a679.tar.gz mandoc-0334f84d7012e2930aa3d735e3c95f156bb3a679.tar.zst mandoc-0334f84d7012e2930aa3d735e3c95f156bb3a679.zip |
Simplify the mparse_open()/mparse_wait() interface.
Don't bother the user with the PID of the child process,
store it inside the opaque mparse handle.
Diffstat (limited to 'read.c')
-rw-r--r-- | read.c | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.96 2014/11/01 06:03:13 schwarze Exp $ */ +/* $Id: read.c,v 1.97 2014/11/26 21:40:17 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -64,6 +64,7 @@ struct mparse { int filenc; /* encoding of the current file */ int reparse_count; /* finite interp. stack */ int line; /* line number in the file */ + pid_t child; /* the gunzip(1) process */ }; static void choose_parser(struct mparse *); @@ -823,8 +824,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *file) } enum mandoclevel -mparse_open(struct mparse *curp, int *fd, const char *file, - pid_t *child_pid) +mparse_open(struct mparse *curp, int *fd, const char *file) { int pfd[2]; char *cp; @@ -834,7 +834,7 @@ mparse_open(struct mparse *curp, int *fd, const char *file, curp->file = file; if ((cp = strrchr(file, '.')) == NULL || strcmp(cp + 1, "gz")) { - *child_pid = 0; + curp->child = 0; if ((*fd = open(file, O_RDONLY)) == -1) { err = MANDOCERR_SYSOPEN; goto out; @@ -847,7 +847,7 @@ mparse_open(struct mparse *curp, int *fd, const char *file, goto out; } - switch (*child_pid = fork()) { + switch (curp->child = fork()) { case -1: err = MANDOCERR_SYSFORK; close(pfd[0]); @@ -871,7 +871,7 @@ mparse_open(struct mparse *curp, int *fd, const char *file, out: *fd = -1; - *child_pid = 0; + curp->child = 0; curp->file_status = MANDOCLEVEL_SYSERR; if (curp->mmsg) (*curp->mmsg)(err, curp->file_status, file, @@ -882,11 +882,14 @@ out: } enum mandoclevel -mparse_wait(struct mparse *curp, pid_t child_pid) +mparse_wait(struct mparse *curp) { int status; - if (waitpid(child_pid, &status, 0) == -1) { + if (curp->child == 0) + return(MANDOCLEVEL_OK); + + if (waitpid(curp->child, &status, 0) == -1) { mandoc_msg(MANDOCERR_SYSWAIT, curp, 0, 0, strerror(errno)); curp->file_status = MANDOCLEVEL_SYSERR; |