Imported from ../bash-3.1.tar.gz.

[platform/upstream/bash.git] / dispose_cmd.c

diff --git a/dispose_cmd.c b/dispose_cmd.c
index 86443f1..ee2e68c 100644 (file)
--- a/dispose_cmd.c
+++ b/dispose_cmd.c
@@ -1,12 +1,12 @@
 /* dispose_command.c -- dispose of a COMMAND structure. */
 
-/* Copyright (C) 1987,1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
    Bash is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    Bash is distributed in the hope that it will be useful, but WITHOUT
@@ -16,10 +16,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #include "config.h"
 
+#include "bashtypes.h"
+
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
@@ -27,6 +29,8 @@
 #include "bashansi.h"
 #include "shell.h"
 
+extern sh_obj_cache_t wdcache, wlcache;
+
 /* Dispose of the command structure passed. */
 void
 dispose_command (command)
@@ -59,6 +63,21 @@ dispose_command (command)
        break;
       }
 
+#if defined (ARITH_FOR_COMMAND)
+    case cm_arith_for:
+      {
+       register ARITH_FOR_COM *c;
+
+       c = command->value.ArithFor;
+       dispose_words (c->init);
+       dispose_words (c->test);
+       dispose_words (c->step);
+       dispose_command (c->action);
+       free (c);
+       break;
+      }
+#endif /* ARITH_FOR_COMMAND */
+
     case cm_group:
       {
        dispose_command (command->value.Group->command);
@@ -66,6 +85,13 @@ dispose_command (command)
        break;
       }
 
+    case cm_subshell:
+      {
+       dispose_command (command->value.Subshell->command);
+       free (command->value.Subshell);
+       break;
+      }
+
     case cm_case:
       {
        register CASE_COM *c;
@@ -132,31 +158,97 @@ dispose_command (command)
        break;
       }
 
+#if defined (DPAREN_ARITHMETIC)
+    case cm_arith:
+      {
+       register ARITH_COM *c;
+
+       c = command->value.Arith;
+       dispose_words (c->exp);
+       free (c);
+       break;
+      }
+#endif /* DPAREN_ARITHMETIC */
+
+#if defined (COND_COMMAND)
+    case cm_cond:
+      {
+       register COND_COM *c;
+
+       c = command->value.Cond;
+       dispose_cond_node (c);
+       break;
+      }
+#endif /* COND_COMMAND */
+
     case cm_function_def:
       {
        register FUNCTION_DEF *c;
 
        c = command->value.Function_def;
-       dispose_word (c->name);
-       dispose_command (c->command);
-       free (c);
+       dispose_function_def (c);
        break;
       }
 
     default:
-      programming_error ("dispose_command: bad command type `%d'", command->type);
+      command_error ("dispose_command", CMDERR_BADTYPE, command->type, 0);
       break;
     }
   free (command);
 }
 
+#if defined (COND_COMMAND)
+/* How to free a node in a conditional command. */
+void
+dispose_cond_node (cond)
+     COND_COM *cond;
+{
+  if (cond)
+    {
+      if (cond->left)
+       dispose_cond_node (cond->left);
+      if (cond->right)
+       dispose_cond_node (cond->right);
+      if (cond->op)
+       dispose_word (cond->op);
+      free (cond);
+    }
+}
+#endif /* COND_COMMAND */
+
+void
+dispose_function_def_contents (c)
+     FUNCTION_DEF *c;
+{
+  dispose_word (c->name);
+  dispose_command (c->command);
+  FREE (c->source_file);
+}
+
+void
+dispose_function_def (c)
+     FUNCTION_DEF *c;
+{
+  dispose_function_def_contents (c);
+  free (c);
+}
+
 /* How to free a WORD_DESC. */
 void
-dispose_word (word)
-     WORD_DESC *word;
+dispose_word (w)
+     WORD_DESC *w;
+{
+  FREE (w->word);
+  ocache_free (wdcache, WORD_DESC, w);
+}
+
+/* Free a WORD_DESC, but not the word contained within. */
+void
+dispose_word_desc (w)
+     WORD_DESC *w;
 {
-  FREE (word->word);
-  free (word);
+  w->word = 0;
+  ocache_free (wdcache, WORD_DESC, w);
 }
 
 /* How to get rid of a linked list of words.  A WORD_LIST. */
@@ -171,22 +263,32 @@ dispose_words (list)
       t = list;
       list = list->next;
       dispose_word (t->word);
+#if 0
       free (t);
+#else
+      ocache_free (wlcache, WORD_LIST, t);
+#endif
     }
 }
 
-/* How to dispose of an array of pointers to char. */
+#ifdef INCLUDE_UNUSED
+/* How to dispose of an array of pointers to char.  This is identical to
+   free_array in stringlib.c. */
 void
 dispose_word_array (array)
      char **array;
 {
   register int count;
 
+  if (array == 0)
+    return;
+
   for (count = 0; array[count]; count++)
     free (array[count]);
 
   free (array);
 }
+#endif
 
 /* How to dispose of an list of redirections.  A REDIRECT. */
 void
@@ -205,6 +307,7 @@ dispose_redirects (list)
        case r_deblank_reading_until:
          free (t->here_doc_eof);
        /*FALLTHROUGH*/
+       case r_reading_string:
        case r_output_direction:
        case r_input_direction:
        case r_inputa_direction:
@@ -214,6 +317,8 @@ dispose_redirects (list)
        case r_output_force:
        case r_duplicating_input_word:
        case r_duplicating_output_word:
+       case r_move_input_word:
+       case r_move_output_word:
          dispose_word (t->redirectee.filename);
          /* FALLTHROUGH */
        default: