--- stack/stack.c	2002/02/14 22:44:49	1.83
+++ stack/stack.c	2002/02/15 12:45:28	1.85
@@ -1,4 +1,4 @@
-/* printf, sscanf, fgets, fprintf */
+/* printf, sscanf, fgets, fprintf, fopen, perror */
 #include <stdio.h>
 /* exit, EXIT_SUCCESS, malloc, free */
 #include <stdlib.h>
@@ -8,6 +8,10 @@
 #include <dlfcn.h>
 /* strcmp, strcpy, strlen, strcat, strdup */
 #include <string.h>
+/* getopt, STDIN_FILENO, STDOUT_FILENO */
+#include <unistd.h>
+/* EX_NOINPUT, EX_USAGE */
+#include <sysexits.h>
 /* mtrace, muntrace */
 #include <mcheck.h>
 
@@ -63,6 +67,8 @@
   char *in_string;		/* Input pending to be read */
   char *free_string;		/* Free this string when all input is
                                    read from in_string */
+  FILE *inputstream;		/* stdin or a file, most likely */
+  int interactive;		/* print prompts, stack, etc */
 } environment;
 
 /* A type for pointers to external functions */
@@ -74,10 +80,14 @@
 {
   int i;
 
-  env->in_string= NULL;
-  env->err= 0;
+  env->head= NULL;
   for(i= 0; i<HASHTBLSIZE; i++)
     env->symbols[i]= NULL;
+  env->err= 0;
+  env->in_string= NULL;
+  env->free_string= NULL;
+  env->inputstream= stdin;
+  env->interactive= 1;
 }
 
 void printerr(const char* in_string) {
@@ -749,8 +759,6 @@
 
   clear(env);
 
-  words(env);
-
   if (env->err) return;
   for(i= 0; i<HASHTBLSIZE; i++) {
     while(env->symbols[i]!= NULL) {
@@ -759,8 +767,6 @@
     env->symbols[i]= NULL;
   }
 
-  words(env);
-
   if(env->free_string!=NULL)
     free(env->free_string);
   
@@ -834,26 +840,59 @@
   push_int(env, env->err);
 }
 
-extern void read(environment*);
+extern void sx_72656164(environment*);
 
-int main()
+int main(int argc, char **argv)
 {
   environment myenv;
 
+  int c;			/* getopt option character */
+
   mtrace();
 
   init_env(&myenv);
 
+  myenv.interactive = isatty(STDIN_FILENO) && isatty(STDOUT_FILENO);
+
+  while ((c = getopt (argc, argv, "i")) != -1)
+    switch (c)
+      {
+      case 'i':
+	myenv.interactive = 1;
+	break;
+      case '?':
+	fprintf (stderr,
+		 "Unknown option character `\\x%x'.\n",
+		 optopt);
+	return EX_USAGE;
+      default:
+	abort ();
+      }
+  
+  if (optind < argc) {
+    myenv.interactive = 0;
+    myenv.inputstream= fopen(argv[optind], "r");
+    if(myenv.inputstream== NULL) {
+      perror(argv[0]);
+      exit (EX_NOINPUT);
+    }
+  }
+
   while(1) {
     if(myenv.in_string==NULL) {
-      nl();
-      printstack(&myenv);
-      printf("> ");
-    }
-    read(&myenv);
-    if(myenv.err) {
-      printf("(error %d) ", myenv.err);
+      if (myenv.interactive) {
+	if(myenv.err) {
+	  printf("(error %d)\n", myenv.err);
+	}
+	nl();
+	printstack(&myenv);
+	printf("> ");
+      }
       myenv.err=0;
+    }
+    sx_72656164(&myenv);
+    if (myenv.err==4) {
+      return EX_NOINPUT;
     } else if(myenv.head!=NULL
 	      && myenv.head->item->type==symb
 	      && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
@@ -865,7 +904,7 @@
   return EXIT_FAILURE;
 }
 
-/* + */
+/* "+" */
 extern void sx_2b(environment *env) {
   int a, b;
   size_t len;
@@ -915,7 +954,7 @@
   }
 }
 
-/* - */
+/* "-" */
 extern void sx_2d(environment *env) {
   int a, b;
 
@@ -944,7 +983,7 @@
   }
 }
 
-/* > */
+/* ">" */
 extern void sx_3e(environment *env) {
   int a, b;
 
@@ -1018,8 +1057,8 @@
   return new_value;
 }
 
-/* duplicates an item on the stack */
-extern void dup(environment *env) {
+/* "dup"; duplicates an item on the stack */
+extern void sx_647570(environment *env) {
   if((env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err=1;
@@ -1095,7 +1134,7 @@
   eval(env);
 }
 
-/* while */
+/* "while" */
 extern void sx_7768696c65(environment *env) {
 
   int truth;
@@ -1141,7 +1180,7 @@
   free_val(loop);
 }
 
-/* For-loop */
+/* "for"; For-loop */
 extern void sx_666f72(environment *env) {
   
   value *loop, *foo;
@@ -1180,7 +1219,7 @@
   free_val(foo);
 }
 
-/* 'to' */
+/* "to" */
 extern void to(environment *env) {
   int i, start, ending;
   stackitem *temp_head;
@@ -1227,12 +1266,14 @@
 extern void readline(environment *env) {
   char in_string[101];
 
-  fgets(in_string, 100, stdin);
-  push_cstring(env, in_string);
+  if(fgets(in_string, 100, env->inputstream)==NULL)
+    push_cstring(env, "");
+  else
+    push_cstring(env, in_string);
 }
 
-/* Read a value and place on stack */
-extern void read(environment *env) {
+/* "read"; Read a value and place on stack */
+extern void sx_72656164(environment *env) {
   const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%n";
   const char strform[]= "\"%[^\"]\"%n";
   const char intform[]= "%i%n";
@@ -1247,10 +1288,15 @@
   size_t inlength;
 
   if(env->in_string==NULL) {
-    if(depth > 0) {
+    if(depth > 0 && env->interactive) {
       printf("]> ");
     }
     readline(env); if(env->err) return;
+
+    if(((char *)(env->head->item->content.ptr))[0]=='\0'){
+      env->err= 4;		/* "" means EOF */
+      return;
+    }
     
     env->in_string= malloc(strlen(env->head->item->content.ptr)+1);
     env->free_string= env->in_string; /* Save the original pointer */
@@ -1295,5 +1341,5 @@
   free(match);
 
   if(depth)
-    return read(env);
+    return sx_72656164(env);
 }