Changeset 10647 for trunk/Ohana/src/opihi/lib.shell/exec_loop.c

Timestamp:

Dec 11, 2006, 10:15:41 PM (19 years ago)

Author:

eugene

Message:

moved global List into ListOps.c

File:

• trunk/Ohana/src/opihi/lib.shell/exec_loop.c (modified) (3 diffs)

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

@@ -8 +8 @@
   
   /* increase the shell level (Nlists) by one */
-  Nlists ++;
-  ThisList = Nlists;
-  REALLOCATE (lists, List, MAX (ThisList, 0) + 1);
-  
+  ThisList = increase_list_depth();
+  if (ThisList == 0) abort();
+
   /* copy the macro to the current list */
-  lists[ThisList].Nlines = loop[0].Nlines;
-  ALLOCATE (lists[ThisList].line, char *, MAX (lists[ThisList].Nlines, 1));
-  for (j = 0; j < lists[ThisList].Nlines; j++) {
-    lists[ThisList].line[j] = strcreate (loop[0].line[j]);
+  for (j = 0; j < loop[0].Nlines; j++) {
+    add_listentry (ThisList, loop[0].line[j]);
   }
 
@@ -26 +23 @@
   loop_continue = loop_break = FALSE;
   status = TRUE;
-  Nlines = lists[ThisList].Nlines;
-  for (n = 0; (n < Nlines) && !interrupt; n++) {
-    lists[ThisList].n = n; 
-    line = lists[ThisList].line[n];
 
+  while (!interrupt) {
+    line = get_next_listentry (ThisList);
+    if (line == NULL) break;
     status = multicommand (line);
-
-    if (line != NULL) free (line);
-    n = lists[ThisList].n;
-    Nlines = lists[ThisList].Nlines;
+    free (line);
     if (auto_break && !status) loop_break = TRUE;
     if (loop_break || loop_continue) break;
@@ -42 +35 @@
 
   /* free remaining lines on the list, free the list, decrement the shell level */
-  for (n ++; n < Nlines; n ++) {
-      free (lists[ThisList].line[n]);
-  }
-  free (lists[ThisList].line);
-  Nlists --;
-  REALLOCATE (lists, List, MAX (Nlists, 0) + 1);
+  /*** can we free a list which is not the bottom lists? */
+  decrease_list_depth();
 
   if (loop_break) return (FALSE);