Skip to content

Commit cf9286d

Browse files
Higgs1williamh
authored andcommitted
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.
1 parent 9934e9f commit cf9286d

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

src/shared/meson.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ schedules_c = files([
1010
'schedules.c',
1111
])
1212

13+
pipes_c = files([
14+
'pipes.c',
15+
])
16+
1317
if selinux_dep.found()
1418
selinux_c = files([
1519
'selinux.c',

src/start-stop-daemon/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
executable('start-stop-daemon',
2-
['start-stop-daemon.c', 'pipes.c', misc_c, schedules_c,
2+
['start-stop-daemon.c', pipes_c, misc_c, schedules_c,
33
selinux_c, usage_c, version_h],
44
c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags],
55
link_with: [libeinfo, librc],

src/supervise-daemon/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
executable('supervise-daemon',
2-
['supervise-daemon.c', '../start-stop-daemon/pipes.c', misc_c, plugin_c, schedules_c, usage_c, version_h],
2+
['supervise-daemon.c', pipes_c, misc_c, plugin_c, schedules_c, usage_c, version_h],
33
c_args : [cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags],
44
link_with: [libeinfo, librc],
55
dependencies: [dl_dep, pam_dep, cap_dep, util_dep, selinux_dep],

src/supervise-daemon/supervise-daemon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static struct pam_conv conv = { NULL, NULL};
6262
#include "queue.h"
6363
#include "rc.h"
6464
#include "misc.h"
65-
#include "../start-stop-daemon/pipes.h"
65+
#include "pipes.h"
6666
#include "plugin.h"
6767
#include "schedules.h"
6868
#include "_usage.h"

0 commit comments

Comments
 (0)