progenvhotfix4 - the last register wasn't getting passed back from

elist2arr.  Z now passes along correctly.
(cherry picked from commit 95cc0e8358f6148b7e977543e8498b0e300ee364)

diff --git a/src/funlist.c b/src/funlist.c
index c7becbab29018e1667898d4fec3b2f4c9954a215..47f1c32c3c750e86964b782921969389b7283aaf 100644 (file)
--- a/src/funlist.c
+++ b/src/funlist.c
@@ -119,7 +119,7 @@ int elist2arr(char *r[], int max, char *list, char sep) {
    i = 0;
 
    /* Do first */
-   while(p && *p && (i < max)) {
+   while(p && *p && (i <= max)) {
      if(*p == '\\' && (p + 1)) {
        /* Remove This Char & let the next char in */
        *p++ = '\0';
@@ -139,9 +139,16 @@ int elist2arr(char *r[], int max, char *list, char sep) {
      }
      p++;
    }
+   /* Insert our final one.. */
+
+   if(lp != NULL) {
+     safe_str(lp, cbufp, &bp);
+     *bp = '\0';
+     r[i] = cbufp;
+   }
 
      
-  return i;
+  return i+1;
 }