diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-30 13:06:32 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-30 13:06:32 +0000 |
| commit | 940294e0758239f337f76f3c0f096a8cd632f2ca (patch) | |
| tree | 3f72411c73d60fde0d5a21d1714e792d82cd6895 /src/rpc | |
| parent | 74b9e54d92a0b0937b457b2a2e4e5bc3a5eae783 (diff) | |
| download | skabus-940294e0758239f337f76f3c0f096a8cd632f2ca.tar.xz | |
Fix build; adapt to skalibs-2.10.0.0
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/skabus-rpc-client.c | 8 | ||||
| -rw-r--r-- | src/rpc/skabus-rpc-daemon.c | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/rpc/skabus-rpc-client.c b/src/rpc/skabus-rpc-client.c index 9cf9efe..bd7566d 100644 --- a/src/rpc/skabus-rpc-client.c +++ b/src/rpc/skabus-rpc-client.c @@ -3,15 +3,17 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> -#include <skalibs/djbunix.h> +#include <skalibs/exec.h> + #include <s6/config.h> + #include <skabus/config.h> #include "skabus-rpcc.h" #define USAGE "skabus-rpc-client [ -v verbosity ] [ -d | -D ] [ -1 ] [ -c maxconn ] [ -b backlog ] [ -t timeout ] [ -T lameducktimeout ] [ -C pmprog:sep:flags ] [ -y ifname:ifprog:sep:flags ... ] rpccpath rpcdpath clientname" #define dieusage() strerr_dieusage(100, USAGE) -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { unsigned int verbosity = 1 ; int flag1 = 0 ; @@ -115,6 +117,6 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = *argv++ ; newargv[m++] = *argv++ ; newargv[m++] = 0 ; - xpathexec_run(newargv[0], newargv, envp) ; + xexec(newargv) ; } } diff --git a/src/rpc/skabus-rpc-daemon.c b/src/rpc/skabus-rpc-daemon.c index 14be950..76a8e1e 100644 --- a/src/rpc/skabus-rpc-daemon.c +++ b/src/rpc/skabus-rpc-daemon.c @@ -2,17 +2,20 @@ #include <sys/types.h> #include <limits.h> + #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> -#include <skalibs/djbunix.h> +#include <skalibs/exec.h> + #include <s6/config.h> + #include <skabus/config.h> #define USAGE "skabus-rpc-daemon [ -v verbosity ] [ -d | -D ] [ -1 ] [ -c maxconn ] [ -b backlog ] [ -G gid,gid,... ] [ -g gid ] [ -u uid ] [ -U ] [ -t timeout ] [ -T lameducktimeout ] [ -i rulesdir | -x rulesfile ] [ -S | -s ] [ -J | -j ] path" #define dieusage() strerr_dieusage(100, USAGE) -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { unsigned int verbosity = 1 ; int flag1 = 0 ; @@ -149,6 +152,6 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = rulesfile ; } newargv[m++] = 0 ; - xpathexec_run(newargv[0], newargv, envp) ; + xexec(newargv) ; } } |