From 1b5312d5c01fd5e12b938cfe65cda562e822619d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 11 Mar 2017 12:16:25 +0000
Subject:  Adapt to skalibs-2.5.0.0

---
 src/skaembutils/s6-env.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/skaembutils/s6-env.c')

diff --git a/src/skaembutils/s6-env.c b/src/skaembutils/s6-env.c
index b2e1312..8db6288 100644
--- a/src/skaembutils/s6-env.c
+++ b/src/skaembutils/s6-env.c
@@ -1,8 +1,8 @@
 /* ISC license. */
 
+#include <string.h>
 #include <errno.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
@@ -20,7 +20,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, "i", &l) ;
+      int opt = subgetopt_r(argc, argv, "i", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
@@ -32,7 +32,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   for (; argc ; argc--, argv++)
   {
-    if (!(*argv)[str_chr(*argv, '=')]) break ;
+    if (!strchr(*argv, '=')) break ;
     if (!stralloc_cats(&modifs, *argv) || !stralloc_0(&modifs))
       strerr_diefu1sys(111, "stralloc_cats") ;
   }
-- 
cgit v1.3.1