From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1C68138334 for ; Wed, 13 Jun 2018 21:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFBEAE0986; Wed, 13 Jun 2018 21:28:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9D98E0986 for ; Wed, 13 Jun 2018 21:28:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 709B5335C0C for ; Wed, 13 Jun 2018 21:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A172A2C5 for ; Wed, 13 Jun 2018 21:28:44 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1528915782.ec8abea4605395a2a59b26906ce4677a578e3c60.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/Makefile src/rc/rc-pipes.c src/rc/rc-pipes.h X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ec8abea4605395a2a59b26906ce4677a578e3c60 X-VCS-Branch: master Date: Wed, 13 Jun 2018 21:28:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11e7b728-ee35-45aa-89ac-c8cb5f291648 X-Archives-Hash: c4d1d0732185296270e342ff93689b16 commit: ec8abea4605395a2a59b26906ce4677a578e3c60 Author: Mike Gilbert gentoo org> AuthorDate: Wed Jun 13 18:49:42 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Jun 13 18:49:42 2018 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ec8abea4 Add helper to spawn process with stdin connected to a pipe src/rc/Makefile | 4 ++-- src/rc/rc-pipes.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/rc/rc-pipes.h | 18 ++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/rc/Makefile b/src/rc/Makefile index 5e2a5e94..4b0983b5 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -5,8 +5,8 @@ include ${MK}/os.mk SRCS= checkpath.c do_e.c do_mark_service.c do_service.c \ do_value.c fstabinfo.c is_newer_than.c is_older_than.c \ mountinfo.c openrc-run.c rc-abort.c rc.c \ - rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \ - rc-service.c rc-status.c rc-update.c \ + rc-depend.c rc-logger.c rc-misc.c rc-pipes.c \ + rc-plugin.c rc-service.c rc-status.c rc-update.c \ shell_var.c start-stop-daemon.c supervise-daemon.c swclock.c _usage.c ifeq (${MKSELINUX},yes) diff --git a/src/rc/rc-pipes.c b/src/rc/rc-pipes.c new file mode 100644 index 00000000..55f3ff8d --- /dev/null +++ b/src/rc/rc-pipes.c @@ -0,0 +1,57 @@ +/* + * rc-pipes.c + * Helper to handle spawning processes and connecting them to pipes. + */ + +/* + * Copyright (c) 2018 The OpenRC Authors. + * See the Authors file at the top-level directory of this distribution and + * https://github.com/OpenRC/openrc/blob/master/AUTHORS + * + * This file is part of OpenRC. It is subject to the license terms in + * the LICENSE file found in the top-level directory of this + * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE + * This file may not be copied, modified, propagated, or distributed + * except according to the terms contained in the LICENSE file. + */ + +#include +#include +#include + +#include "rc-pipe-command.h" + +static const int pipe_read_end = 0; +static const int pipe_write_end = 1; + +/* + * Starts a command with stdin redirected from a pipe + * Returns the write end of the pipe or -1 + */ +int rc_pipe_command(char *cmd) +{ + int pfd[2]; + pid_t pid; + + if (pipe(pfd) < 0) + return -1; + + pid = fork(); + if (pid < 0) + return -1; + else if (pid > 0) { + /* parent */ + close(pfd[0]); + return pfd[pipe_write_end]; + } else if (pid == 0) { + /* child */ + close(pfd[pipe_write_end]); + if (pfd[0] != STDIN_FILENO) { + if (dup2(pfd[0], STDIN_FILENO) < 0) + exit(1); + close(pfd[0]); + } + execl("/bin/sh", "sh", "-c", cmd, NULL); + exit(1); + } +} diff --git a/src/rc/rc-pipes.h b/src/rc/rc-pipes.h new file mode 100644 index 00000000..0c605ced --- /dev/null +++ b/src/rc/rc-pipes.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2018 The OpenRC Authors. + * See the Authors file at the top-level directory of this distribution and + * https://github.com/OpenRC/openrc/blob/master/AUTHORS + * + * This file is part of OpenRC. It is subject to the license terms in + * the LICENSE file found in the top-level directory of this + * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE + * This file may not be copied, modified, propagated, or distributed + * except according to the terms contained in the LICENSE file. + */ + +#ifndef RC_PIPES_H +#define RC_PIPES_H + +int rc_pipe_command(char *cmd); + +#endif