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

Timestamp:

Dec 16, 2007, 2:27:00 PM (19 years ago)

Author:

eugene

Message:

fixed cases of hard-wired line length; some api cleanup in stack_math

File:

• trunk/Ohana/src/opihi/lib.shell/expand_vectors.c (modified) (7 diffs)

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

@@ -3 +3 @@
 char *expand_vectors (char *line) {
 
-  char *newline, *tmpline, *val;
+  char *newline, *tmpline, strValue[128], *val;
   char *L, *N, *p, *q, *w;
-  int n, I, size;
+  int n, I, size, showLength, NLINE, Noff;
   double f1;
   Vector *vec;
@@ -11 +11 @@
   if (line == NULL) return (NULL);
 
-  ALLOCATE (newline, char, 1024);  /* WARNING: this limits the length of the input line */
-  ALLOCATE (tmpline, char, 1024);  /* WARNING: this limits the length of the input line */
+  NLINE = MAX (128, strlen(line));
+  ALLOCATE (newline, char, NLINE);
 
   /* look for form fred[stuff] */
@@ -19 +19 @@
   if (L == NULL) {
     free (newline);
-    free (tmpline);
     return (line);
   }
@@ -35 +34 @@
     if (p > q) goto dumpline; /* odd state: unmatched pair: ][ */
     n = (int) (q - p - 1);
+    val = NULL;
+    showLength = FALSE;
     if (n == 0) {
-      ALLOCATE (val, char, 64);
-      sprintf (val, "-1");
-      /* this choice of sentinel prevents us from using 
-         x[-1], x[-2], and is not really needed */
+      showLength = TRUE;
     } else {
-      strncpy (tmpline, p+1, n);
-      tmpline[n] = 0;
+      tmpline = strncreate (p+1, n);
       val = dvomath (1, &tmpline, &size, 0);
+      free (tmpline);
       if (val == NULL) goto dumpline; /* not a valid vector subscript */
     }
-    I = atoi (val);
-    free (val);
+    I = 0; 
+    if (val != NULL) {
+      I = atoi (val);
+      free (val);
+    }      
 
     /* find vector name */
@@ -53 +54 @@
     w ++;
     n = (int)(p - w);
-    strncpy (tmpline, w, n);
-    tmpline[n] = 0;
+    tmpline = strncreate (w, n);
     if ((vec = SelectVector (tmpline, OLDVECTOR, TRUE)) == NULL) goto dumpline;
+    free (tmpline);
 
     /* find vector element */
-    if (I >= vec[0].Nelements) {
+    if ((I >= vec[0].Nelements) || (I < -1*vec[0].Nelements)) {
       gprint (GP_ERR, "vector subscript out of range\n"); 
       goto escape;
     }
-    if (I < 0) {
+    if (showLength) {
       f1 = vec[0].Nelements;
     } else {
-      f1 = vec[0].elements[I];
+      if (I < 0) {
+        f1 = vec[0].elements[vec[0].Nelements+I];
+      } else {
+        f1 = vec[0].elements[I];
+      }
     }
     if ((int)f1 == f1) 
-      sprintf (tmpline, "%.0f", f1);
+      snprintf (strValue, 128, "%.0f", f1);
     else
-      sprintf (tmpline, "%.9g", f1);
-    /* interpolate vector element */
+      snprintf (strValue, 128, "%.9g", f1);
+
+    /* interpolate vector element into newline (being accumulated) */
+    size = (N - newline) + (w - L) + strlen(strValue);
+    if (size >= NLINE) {
+      Noff = N - newline;
+      NLINE += 128 + strlen(strValue) + (w - L);
+      REALLOCATE (newline, char, NLINE);
+      N = newline + Noff;
+    }
+
     n = (int) (w - L);
     strncpy (N, L, n);
     N += n;
-    n = strlen (tmpline);
-    strncpy (N, tmpline, n);
+    n = strlen (strValue);
+    strncpy (N, strValue, n);
     N += n;
     L = q + 1;
@@ -82 +96 @@
 
 dumpline:
+  size = (N - newline) + strlen(L);
+  if (size >= NLINE) {
+    Noff = N - newline;
+    NLINE += 128 + strlen(L);
+    REALLOCATE (newline, char, NLINE);
+    N = newline + Noff;
+  }
+
   n = strlen (L);
   strncpy (N, L, n);
   N[n] = 0;
   free (line);
-  free (tmpline);
   return (newline);
   
@@ -92 +113 @@
   free (line);
   free (newline);
-  free (tmpline);
   return (NULL);
 }