From f9940bb7d1a6ce7d7772e8cbdbbd55a321cc5c18 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 8 Oct 2017 15:39:57 +0000 Subject: Add -s to s6-rc-init; prepare for 0.3.0.0 --- src/libs6rc/s6rc_servicedir_unsupervise.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/libs6rc/s6rc_servicedir_unsupervise.c') diff --git a/src/libs6rc/s6rc_servicedir_unsupervise.c b/src/libs6rc/s6rc_servicedir_unsupervise.c index 8b0dbb9..ed95152 100644 --- a/src/libs6rc/s6rc_servicedir_unsupervise.c +++ b/src/libs6rc/s6rc_servicedir_unsupervise.c @@ -5,14 +5,16 @@ #include #include -void s6rc_servicedir_unsupervise (char const *live, char const *name, int keepsupervisor) +void s6rc_servicedir_unsupervise (char const *live, char const *suffix, char const *name, int keepsupervisor) { - size_t namelen = strlen(name) ; size_t livelen = strlen(live) ; - char fn[livelen + 14 + namelen] ; + size_t suffixlen = strlen(suffix) ; + size_t namelen = strlen(name) ; + char fn[livelen + 14 + namelen + suffixlen] ; memcpy(fn, live, livelen) ; memcpy(fn + livelen, "/scandir/", 9) ; - memcpy(fn + livelen + 9, name, namelen + 1) ; + memcpy(fn + livelen + 9, name, namelen) ; + memcpy(fn + livelen + 9 + namelen, suffix, suffixlen + 1) ; unlink(fn) ; if (!keepsupervisor) { -- cgit v1.2.3