Merge branch '2.15.0.0'

1 files changed, 15 insertions, 19 deletions

diff --git a/src/libs6/s6_compat_el_semicolon.c b/src/libs6/s6_compat_el_semicolon.c
index fe4787e..8d214dd 100644
--- a/src/libs6/s6_compat_el_semicolon.c
+++ b/src/libs6/s6_compat_el_semicolon.c
@@ -25,30 +25,26 @@ static unsigned int el_getstrict (void)
 int s6_compat_el_semicolon (char const **argv)
 {
   static unsigned int nblock = 0 ;
-  int argc1 = 0 ;
+  unsigned int strict = el_getstrict() ;
   nblock++ ;
-  for (;; argc1++, argv++)
+  unsigned int i = 0 ;
+  for (; argv[i] ; i++)
   {
-    char const *arg = *argv ;
-    if (!arg) return argc1 + 1 ;
-    if (!arg[0]) return argc1 ;
-    else if (arg[0] == ' ') ++*argv ;
-    else
+    if (!argv[i][0]) return i ;
+    else if (argv[i][0] == ' ') argv[i]++ ;
+    else if (strict)
     {
-      unsigned int strict = el_getstrict() ;
-      if (strict)
-      {
-        char fmt1[UINT_FMT] ;
-        char fmt2[UINT_FMT] ;
-        fmt1[uint_fmt(fmt1, nblock)] = 0 ;
-        fmt2[uint_fmt(fmt2, (unsigned int)argc1)] = 0 ;
-        if (strict >= 2)
-          strerr_dief6x(100, "unquoted argument ", arg, " at block ", fmt1, " position ", fmt2) ;
-        else
-          strerr_warnw6x("unquoted argument ", arg, " at block ", fmt1, " position ", fmt2) ;
-      }
+      char fmt1[UINT_FMT] ;
+      char fmt2[UINT_FMT] ;
+      fmt1[uint_fmt(fmt1, nblock)] = 0 ;
+      fmt2[uint_fmt(fmt2, i)] = 0 ;
+      if (strict >= 2)
+        strerr_dief6x(100, "unquoted argument ", argv[i], " at block ", fmt1, " position ", fmt2) ;
+      else
+        strerr_warnw6x("unquoted argument ", argv[i], " at block ", fmt1, " position ", fmt2) ;
     }
   }
+  return i + 1 ;
 }
 
 #endif