--- stack/stack.c	2002/02/13 19:53:55	1.77
+++ stack/stack.c	2002/02/14 05:21:06	1.78
@@ -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 */
@@ -531,7 +533,7 @@
 
 /* Reverse (flip) a list */
 extern void rev(environment *env){
-  stackitem *item, *temp, *prev= NULL;
+  stackitem *old_head, *new_head, *item;
 
   if((env->head)==NULL) {
     printerr("Too Few Arguments");
@@ -545,16 +547,15 @@
     return;
   }
 
-  item= (stackitem *)(env->head->item->content.ptr);
-  while(item->next!=NULL){
-    temp= item->next;
-    item->next= prev;
-    prev= item;
-    item= temp;
+  old_head=(stackitem *)(env->head->item->content.ptr);
+  new_head=NULL;
+  while(old_head != NULL){
+    item=old_head;
+    old_head=old_head->next;
+    item->next=new_head;
+    new_head=item;
   }
-  item->next= prev;
-
-  env->head->item->content.ptr=item;
+  env->head->item->content.ptr=new_head;
 }
 
 /* Make a list. */
@@ -1195,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;
@@ -1212,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;
   }
@@ -1220,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);