}
/* Read as much as possible into the currently-allocated stdout buffer, and
- * possibly realloc it for the next read */
+ * possibly realloc it for the next read
+ *
+ * Returns:
+ * > 0 on success (even though no bytes may have been read)
+ * 0 on EOF (no error, but no more reads can be performed)
+ * < 0 on error
+ **/
static int process_read_stdout_once(struct process_info *procinfo)
{
struct process *process = &procinfo->process;
max_len = procinfo->stdout_buf_len - process->stdout_len - 1;
rc = read(fd, process->stdout_buf + process->stdout_len, max_len);
- if (rc <= 0)
+ if (rc == 0)
+ return 0;
+ if (rc < 0) {
+ if (errno == EINTR)
+ return 1;
+ pb_log("%s: read failed: %s\n", __func__, strerror(errno));
return rc;
+ }
process->stdout_len += rc;
if (process->stdout_len == procinfo->stdout_buf_len - 1) {
procinfo->stdout_buf_len);
}
- return rc;
+ return 1;
}
static int process_setup_stdout_pipe(struct process_info *procinfo)
else
dup2(log, STDOUT_FILENO);
- dup2(log, STDERR_FILENO);
+ if (procinfo->process.keep_stdout && procinfo->process.add_stderr)
+ dup2(procinfo->stdout_pipe[1], STDERR_FILENO);
+ else
+ dup2(log, STDERR_FILENO);
}
static void process_finish_stdout(struct process_info *procinfo)
process_read_stdout(procinfo);
- rc = waitpid(process->pid, &process->exit_status, 0);
- if (rc == -1) {
+ for (;;) {
+ rc = waitpid(process->pid, &process->exit_status, 0);
+ if (rc >= 0)
+ break;
+ if (errno == EINTR)
+ continue;
+
pb_log("%s: waitpid failed: %s\n", __func__, strerror(errno));
return rc;
}
void process_stop_async(struct process *process)
{
+ pb_debug("process: sending SIGTERM to pid %d\n", process->pid);
kill(process->pid, SIGTERM);
}
return rc;
}
+
+bool process_exit_ok(struct process *process)
+{
+ return WIFEXITED(process->exit_status) &&
+ WEXITSTATUS(process->exit_status) == 0;
+}