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.
OpenRC · Oct 3, 2023 · cf9286d · cf9286d
1 parent 9934e9f
commit cf9286d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/src/shared/meson.build b/src/shared/meson.build
@@ -10,6 +10,10 @@ schedules_c = files([
   'schedules.c',
   ])
 
+pipes_c = files([
+	'pipes.c',
+	])
+
 if selinux_dep.found()
   selinux_c = files([
     'selinux.c',

diff --git a/src/start-stop-daemon/pipes.c → src/shared/pipes.c b/src/start-stop-daemon/pipes.c → src/shared/pipes.c
diff --git a/src/start-stop-daemon/pipes.h → src/shared/pipes.h b/src/start-stop-daemon/pipes.h → src/shared/pipes.h
diff --git 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/supervise-daemon/meson.build b/src/supervise-daemon/meson.build
@@ -1,5 +1,5 @@
 executable('supervise-daemon',
-  ['supervise-daemon.c', '../start-stop-daemon/pipes.c', misc_c, plugin_c, schedules_c, usage_c, version_h],
+  ['supervise-daemon.c', pipes_c, misc_c, plugin_c, schedules_c, usage_c, version_h],
   c_args : [cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags],
   link_with: [libeinfo, librc],
   dependencies: [dl_dep, pam_dep, cap_dep, util_dep, selinux_dep],

diff --git a/src/supervise-daemon/supervise-daemon.c b/src/supervise-daemon/supervise-daemon.c
@@ -62,7 +62,7 @@ static struct pam_conv conv = { NULL, NULL};
 #include "queue.h"
 #include "rc.h"
 #include "misc.h"
-#include "../start-stop-daemon/pipes.h"
+#include "pipes.h"
 #include "plugin.h"
 #include "schedules.h"
 #include "_usage.h"