--- stack/stack.c	2002/02/13 00:16:00	1.75
+++ stack/stack.c	2002/02/14 12:01:58	1.79
@@ -60,6 +60,8 @@
   int err;			/* Error flag */
   int non_eval_flag;
   char *in_string;		/* Input pending to be read */
+  char *free_string;		/* Free this string when all input is
+                                   read from in_string */
 } environment;
 
 /* A type for pointers to external functions */
@@ -716,9 +718,22 @@
   toss(env); toss(env);
 } 
 
+extern void clear(environment *);
+void forget_sym(symbol **);
+
 /* Quit stack. */
 extern void quit(environment *env)
 {
+  long i;
+
+  clear(env);
+  if (env->err) return;
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    while(env->symbols[i]!= NULL) {
+      forget_sym(&(env->symbols[i]));
+      env->symbols[i]= NULL;
+    }
+  }
   exit(EXIT_SUCCESS);
 }
 
@@ -744,12 +759,25 @@
   }
 }
 
+/* Internal forget function */
+void forget_sym(symbol **hash_entry) {
+  symbol *temp;
+
+  temp= *hash_entry;
+  *hash_entry= (*hash_entry)->next;
+  
+  if(temp->val!=NULL) {
+    free_val(temp->val);
+  }
+  free(temp->id);
+  free(temp);
+}
+
 /* Forgets a symbol (remove it from the hash table) */
 extern void forget(environment *env)
 {
   char* sym_id;
   stackitem *stack_head= env->head;
-  symbol **hash_entry, *temp;
 
   if(stack_head==NULL) {
     printerr("Too Few Arguments");
@@ -766,15 +794,7 @@
   sym_id= ((symbol*)(stack_head->item->content.ptr))->id;
   toss(env);
 
-  hash_entry= hash(env->symbols, sym_id);
-  temp= *hash_entry;
-  *hash_entry= (*hash_entry)->next;
-  
-  if(temp->val!=NULL) {
-    free_val(temp->val);
-  }
-  free(temp->id);
-  free(temp);
+  return forget_sym(hash(env->symbols, sym_id));
 }
 
 /* Returns the current error number to the stack */
@@ -1176,15 +1196,15 @@
 
 /* Read a value and place on stack */
 extern void read(environment *env) {
-  const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%[\001-\377]";
-  const char strform[]= "\"%[^\"]\"%[\001-\377]";
-  const char intform[]= "%i%[\001-\377]";
-  const char blankform[]= "%*[ \t]%[\001-\377]";
-  const char ebrackform[]= "%*1[]]%[\001-\377]";
-  const char semicform[]= "%*1[;]%[\001-\377]";
-  const char bbrackform[]= "%*1[[]%[\001-\377]";
+  const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%n";
+  const char strform[]= "\"%[^\"]\"%n";
+  const char intform[]= "%i%n";
+  const char blankform[]= "%*[ \t]%n";
+  const char ebrackform[]= "%*1[]]%n";
+  const char semicform[]= "%*1[;]%n";
+  const char bbrackform[]= "%*1[[]%n";
 
-  int itemp;
+  int itemp, readlength= -1;
   static int depth= 0;
   char *rest, *match;
   size_t inlength;
@@ -1193,6 +1213,7 @@
     readline(env); if(env->err) return;
     
     env->in_string= malloc(strlen(env->head->item->content.ptr)+1);
+    env->free_string= env->in_string; /* Save the original pointer */
     strcpy(env->in_string, env->head->item->content.ptr);
     toss(env); if(env->err) return;
   }
@@ -1201,31 +1222,37 @@
   match= malloc(inlength);
   rest= malloc(inlength);
 
-  if(sscanf(env->in_string, blankform, rest)) {
+  if(sscanf(env->in_string, blankform, &readlength)!=EOF
+     && readlength != -1) {
     ; 
-  } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
+  } else if(sscanf(env->in_string, intform, &itemp, &readlength) != EOF
+	    && readlength != -1) {
     push_int(env, itemp);
-  } else if(sscanf(env->in_string, strform, match, rest) > 0) {
+  } else if(sscanf(env->in_string, strform, match, &readlength) != EOF
+	    && readlength != -1) {
     push_cstring(env, match);
-  } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
+  } else if(sscanf(env->in_string, symbform, match, &readlength) != EOF
+	    && readlength != -1) {
     push_sym(env, match);
-  } else if(sscanf(env->in_string, ebrackform, rest) > 0) {
+  } else if(sscanf(env->in_string, ebrackform, &readlength) != EOF
+	    && readlength != -1) {
     pack(env); if(env->err) return;
-    if(depth!=0) depth--;
-  } else if(sscanf(env->in_string, semicform, rest) > 0) {
+    if(depth != 0) depth--;
+  } else if(sscanf(env->in_string, semicform, &readlength) != EOF
+	    && readlength != -1) {
     push_sym(env, ";");
-  } else if(sscanf(env->in_string, bbrackform, rest) > 0) {
+  } else if(sscanf(env->in_string, bbrackform, &readlength) != EOF
+	    && readlength != -1) {
     push_sym(env, "[");
     depth++;
   } else {
-    free(rest);
-    rest= NULL;
+    free(env->free_string);
+    env->in_string = env->free_string = NULL;
+    free(match);
+  }
+  if ( env->in_string != NULL) {
+    env->in_string += readlength;
   }
-      
-  free(env->in_string);
-  free(match);
-
-  env->in_string= rest;
 
   if(depth)
     return read(env);