Changeset 42389 for trunk/Ohana/src/opihi/lib.shell/expand_vectors.c

Timestamp:

Feb 8, 2023, 12:17:35 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/expand_vectors.c (modified) (4 diffs)

trunk/Ohana/src/opihi/lib.shell/expand_vectors.c

@@ -28 +28 @@
   ALLOCATE (newline, char, NLINE);
 
+  // special case: don't expand vectors in while () statement
+  char *V0 = thiscomm (line);
+  if (V0 && !strncmp ("while", V0, strlen(V0))) {
+      strcpy (newline, line);
+      free (line);
+      return (newline);
+  }
+  free (V0);
+
   /* look for form fred[stuff] */
-  /* skip first word (command) */
-  L = nextword (line);
+  if (*line == '(') {
+    // if line is "(stuff)" then do not skip first word
+      L = line;
+  } else {
+    /* skip first word (command) */
+    L = nextword (line);
+  }
   if (L == NULL) {
     free (newline);
@@ -37 +51 @@
 
   n = L - line;
-  strncpy (newline, line, n);
+  strncpy_nowarn (newline, line, n);
   N = newline + n;
   J = 0;
@@ -242 +256 @@
 
     n = (int) (w - L);
-    strncpy (N, L, n);
+    strncpy_nowarn (N, L, n);
     N += n;
     n = strlen (strValue);
-    strncpy (N, strValue, n);
+    strncpy_nowarn (N, strValue, n);
     N += n;
     L = q + 1;
@@ -260 +274 @@
 
   n = strlen (L);
-  strncpy (N, L, n);
-  N[n] = 0;
+  strncpy_nowarn (N, L, n);
   free (line);
   return (newline);