From cf9286d2d84f7aef237ec0d363c692ef5035aa85 Mon Sep 17 00:00:00 2001
From: Lexxy Fox <lexxyfox@gmail.com>
Date: Tue, 26 Sep 2023 13:30:14 -0500
Subject: Relocate pipes.c and pipes.h file to shared directory.

With the addition of logger process redirect in supervise-daemon,
pipes.c and pipes.h are now included in both s-s-d and supervise-daemon.
Thus it makes sense to move the source files to the src/shared dir.
---
 src/start-stop-daemon/meson.build |  2 +-
 src/start-stop-daemon/pipes.c     | 56 ---------------------------------------
 src/start-stop-daemon/pipes.h     | 18 -------------
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 src/start-stop-daemon/pipes.c
 delete mode 100644 src/start-stop-daemon/pipes.h

(limited to 'src/start-stop-daemon')

diff --git a/src/start-stop-daemon/meson.build b/src/start-stop-daemon/meson.build
index d363ff94..6cae791d 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', '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
deleted file mode 100644
index 5251a4f0..00000000
--- a/src/start-stop-daemon/pipes.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#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
deleted file mode 100644
index 861963b7..00000000
--- a/src/start-stop-daemon/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
-- 
cgit v1.2.3