summaryrefslogtreecommitdiff
path: root/src/fdholder/s6-fdholder-setdumpc.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-03-12 11:59:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-03-12 11:59:43 +0000
commitc60ebd422171808ad58b936914055397bb205bef (patch)
tree7db3e5728d72ad209f8e22b9eb9f337e0b0c3e58 /src/fdholder/s6-fdholder-setdumpc.c
parente28fe5908a91d8795ca9923d64eeed7d3e898434 (diff)
downloads6-c60ebd422171808ad58b936914055397bb205bef.tar.xz
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/fdholder/s6-fdholder-setdumpc.c')
-rw-r--r--src/fdholder/s6-fdholder-setdumpc.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/fdholder/s6-fdholder-setdumpc.c b/src/fdholder/s6-fdholder-setdumpc.c
index 5c80fd7..ff01384 100644
--- a/src/fdholder/s6-fdholder-setdumpc.c
+++ b/src/fdholder/s6-fdholder-setdumpc.c
@@ -1,8 +1,7 @@
/* ISC license. */
-#include <sys/types.h>
-#include <skalibs/uint.h>
-#include <skalibs/bytestr.h>
+#include <string.h>
+#include <skalibs/types.h>
#include <skalibs/env.h>
#include <skalibs/strerr2.h>
#include <skalibs/sgetopt.h>
@@ -24,7 +23,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- register int opt = subgetopt_r(argc, argv, "t:", &l) ;
+ int opt = subgetopt_r(argc, argv, "t:", &l) ;
if (opt == -1) break ;
switch (opt)
{
@@ -52,20 +51,20 @@ int main (int argc, char const *const *argv, char const *const *envp)
{
size_t len ;
unsigned int fd ;
- byte_copy(s, 6, "S6_FD_") ;
+ memcpy(s, "S6_FD_", 6) ;
s[6 + uint_fmt(s+6, i)] = 0 ;
x = env_get2(envp, s) ;
if (!x) strerr_dienotset(100, s) ;
if (!uint0_scan(x, &fd)) strerr_dieinvalid(100, s) ;
dump[i].fd = fd ;
- byte_copy(s, 8, "S6_FDID_") ;
+ memcpy(s, "S6_FDID_", 8) ;
s[8 + uint_fmt(s+8, i)] = 0 ;
x = env_get2(envp, s) ;
if (!x) strerr_dienotset(100, s) ;
- len = str_len(x) ;
+ len = strlen(x) ;
if (!len || len > S6_FDHOLDER_ID_SIZE) strerr_dieinvalid(100, s) ;
- byte_copy(dump[i].id, len+1, x) ;
- byte_copy(s, 11, "S6_FDLIMIT_") ;
+ memcpy(dump[i].id, x, len+1) ;
+ memcpy(s, "S6_FDLIMIT_", 11) ;
s[11 + uint_fmt(s+11, i)] = 0 ;
x = env_get2(envp, s) ;
if (!x) tain_add_g(&dump[i].limit, &tain_infinite_relative) ;