From 82e5478d0e115c409b47cd6532e1b21ab0134de7 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 7 Apr 2022 11:18:56 -0500 Subject: start-stop-daemon: remove rc-prefix from file names --- src/start-stop-daemon/meson.build | 2 +- src/start-stop-daemon/pipes.c | 56 +++++++++++++++++++++++++++++++ src/start-stop-daemon/pipes.h | 18 ++++++++++ src/start-stop-daemon/rc-pipes.c | 56 ------------------------------- src/start-stop-daemon/rc-pipes.h | 18 ---------- src/start-stop-daemon/start-stop-daemon.c | 2 +- 6 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 src/start-stop-daemon/pipes.c create mode 100644 src/start-stop-daemon/pipes.h delete mode 100644 src/start-stop-daemon/rc-pipes.c delete mode 100644 src/start-stop-daemon/rc-pipes.h diff --git a/src/start-stop-daemon/meson.build b/src/start-stop-daemon/meson.build index 39229132..d363ff94 100644 --- a/src/start-stop-daemon/meson.build +++ b/src/start-stop-daemon/meson.build @@ -1,5 +1,5 @@ executable('start-stop-daemon', - ['start-stop-daemon.c', 'rc-pipes.c', misc_c, schedules_c, + ['start-stop-daemon.c', 'pipes.c', misc_c, schedules_c, selinux_c, usage_c, version_h], c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags], link_with: [libeinfo, librc], diff --git a/src/start-stop-daemon/pipes.c b/src/start-stop-daemon/pipes.c new file mode 100644 index 00000000..506196d5 --- /dev/null +++ b/src/start-stop-daemon/pipes.c @@ -0,0 +1,56 @@ +/* + * 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/HEAD/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/HEAD/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 "pipes.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) { + /* parent */ + close(pfd[pipe_read_end]); + return pfd[pipe_write_end]; + } else if (pid == 0) { + /* child */ + close(pfd[pipe_write_end]); + if (pfd[pipe_read_end] != STDIN_FILENO) { + if (dup2(pfd[pipe_read_end], STDIN_FILENO) < 0) + exit(1); + close(pfd[pipe_read_end]); + } + execl("/bin/sh", "sh", "-c", cmd, NULL); + exit(1); + } + return -1; +} diff --git a/src/start-stop-daemon/pipes.h b/src/start-stop-daemon/pipes.h new file mode 100644 index 00000000..861963b7 --- /dev/null +++ b/src/start-stop-daemon/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/HEAD/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/HEAD/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 diff --git a/src/start-stop-daemon/rc-pipes.c b/src/start-stop-daemon/rc-pipes.c deleted file mode 100644 index b4e60e03..00000000 --- a/src/start-stop-daemon/rc-pipes.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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/HEAD/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/HEAD/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-pipes.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) { - /* parent */ - close(pfd[pipe_read_end]); - return pfd[pipe_write_end]; - } else if (pid == 0) { - /* child */ - close(pfd[pipe_write_end]); - if (pfd[pipe_read_end] != STDIN_FILENO) { - if (dup2(pfd[pipe_read_end], STDIN_FILENO) < 0) - exit(1); - close(pfd[pipe_read_end]); - } - execl("/bin/sh", "sh", "-c", cmd, NULL); - exit(1); - } - return -1; -} diff --git a/src/start-stop-daemon/rc-pipes.h b/src/start-stop-daemon/rc-pipes.h deleted file mode 100644 index 861963b7..00000000 --- a/src/start-stop-daemon/rc-pipes.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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/HEAD/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/HEAD/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 diff --git a/src/start-stop-daemon/start-stop-daemon.c b/src/start-stop-daemon/start-stop-daemon.c index 75b9a15c..9117f92f 100644 --- a/src/start-stop-daemon/start-stop-daemon.c +++ b/src/start-stop-daemon/start-stop-daemon.c @@ -71,7 +71,7 @@ static struct pam_conv conv = { NULL, NULL}; #include "queue.h" #include "rc.h" #include "misc.h" -#include "rc-pipes.h" +#include "pipes.h" #include "schedules.h" #include "_usage.h" #include "helpers.h" -- cgit v1.2.3