From 9e07e9620cfc56552000e0099b42aa03a7b2222c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 13 Aug 2021 11:56:57 +0000
Subject:  Fix case

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 .gitignore          |  1 +
 doc/case.html       |  4 ++--
 src/execline/case.c | 29 +++++++++++++++--------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7103ade..acbc423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /src/include/execline/config.h
 /background
 /backtick
+/case
 /define
 /dollarat
 /elgetopt
diff --git a/doc/case.html b/doc/case.html
index a7d2a84..db7e983 100644
--- a/doc/case.html
+++ b/doc/case.html
@@ -110,8 +110,8 @@ case -N -- $1
 to the output of the <tt>/usr/bin/env</tt> command:
 </p>
 
-<pre>0=\([fo]+\)bar\(baz\)
-#=2
+<pre>#=2
+0=\([fo]+\)bar\(baz\)
 1=foooo
 2=baz
 </pre>
diff --git a/src/execline/case.c b/src/execline/case.c
index 8fdf21e..77f905e 100644
--- a/src/execline/case.c
+++ b/src/execline/case.c
@@ -14,41 +14,42 @@
 #define USAGE "case [ -e | -E ] [ -n | -N ] [ -i ] value { re1 { prog1... } re2 { prog2... } ... } progdefault... "
 #define dieusage() strerr_dieusage(100, USAGE)
 
-static void execit (char const *const *argv, char const *expr, char const *s, regmatch_t const *pmatch, size_t nsub, int flagnosub) gccattr_noreturn ;
-static void execit (char const *const *argv, char const *expr, char const *s, regmatch_t const *pmatch, size_t nsub, int flagnosub)
+static void execit (char const *const *argv, char const *expr, char const *s, regmatch_t const *pmatch, size_t n) gccattr_noreturn ;
+static void execit (char const *const *argv, char const *expr, char const *s, regmatch_t const *pmatch, size_t n)
 {
-  if (flagnosub) xexec0(argv) ;
-  else
+  if (n)
   {
     size_t exprlen = strlen(expr) ;
     size_t fmtlen = exprlen + 6 ;
-    for (size_t i = 0 ; i < nsub ; i++)
-      fmtlen += uint_fmt(0, i+1) + 2 + pmatch[i].rm_eo - pmatch[i].rm_so ;
+    for (size_t i = 1 ; i < n ; i++)
+      fmtlen += uint_fmt(0, i) + 2 + pmatch[i].rm_eo - pmatch[i].rm_so ;
     {
       size_t m = 0 ;
       char fmt[fmtlen] ;
       fmt[m++] = '#' ; fmt[m++] = '=' ;
-      m += uint_fmt(fmt + m, nsub) ;
+      m += uint_fmt(fmt + m, n-1) ;
       fmt[m++] = 0 ;
       fmt[m++] = '0' ; fmt[m++] = '=' ;
       memcpy(fmt + m, expr, exprlen + 1) ; m += exprlen + 1 ;
-      for (size_t i = 0 ; i < nsub ; i++)
+      for (size_t i = 1 ; i < n ; i++)
       {
-        m += uint_fmt(fmt + m, i+1) ;
+        m += uint_fmt(fmt + m, i) ;
         fmt[m++] = '=' ;
         memcpy(fmt + m, s + pmatch[i].rm_so, pmatch[i].rm_eo - pmatch[i].rm_so) ;
+        m += pmatch[i].rm_eo - pmatch[i].rm_so ;
         fmt[m++] = 0 ;
       }
-      xmexec0_n(argv, fmt, fmtlen, 2 + nsub) ;
+      xmexec0_n(argv, fmt, fmtlen, n+1) ;
     }
   }
+  else xexec0(argv) ;
 }
 
 int main (int argc, char const **argv, char const *const *envp)
 {
   int flagextended = 1 ;
-  int flagicase = 0 ;
   int flagnosub = 1 ;
+  int flagicase = 0 ;
   int argc1 ;
   unsigned int i = 0 ;
   char const *s ;
@@ -102,12 +103,12 @@ int main (int argc, char const **argv, char const *const *envp)
       }
     }
     {
-      regmatch_t pmatch[re.re_nsub && !flagnosub ? re.re_nsub : 1] ;
-      int r = regexec(&re, s, re.re_nsub, pmatch, 0) ;
+      regmatch_t pmatch[re.re_nsub && !flagnosub ? re.re_nsub + 1 : 1] ;
+      int r = regexec(&re, s, re.re_nsub + 1, pmatch, 0) ;
       if (!r)
       {
         argv[i + argc2] = 0 ;
-        execit(argv + i, expr, s, pmatch, flagnosub ? 0 : re.re_nsub, flagnosub) ;
+        execit(argv + i, expr, s, pmatch, flagnosub ? 0 : 1 + re.re_nsub) ;
       }
       if (r != REG_NOMATCH)
       {
-- 
cgit 1.4.1