===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.32
retrieving revision 1.39
diff -u -p -r1.32 -r1.39
--- OpenXM_contrib2/asir2000/parse/glob.c	2003/03/07 03:12:31	1.32
+++ OpenXM_contrib2/asir2000/parse/glob.c	2003/10/20 09:17:52	1.39
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.31 2003/02/14 22:29:18 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.38 2003/10/19 02:54:41 ohara Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -61,6 +61,10 @@
 #if defined(VISUAL)
 #include <io.h>
 #include <direct.h>
+#else
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
 #endif
 
 #if defined(SYSV) && !defined(_IBMR2)
@@ -124,29 +128,26 @@ struct oVS oGPVS,oAPVS,oEPVS;
 VS GPVS = &oGPVS;
 VS APVS = &oAPVS;
 VS EPVS = &oEPVS;
-VS CPVS;
+VS CPVS,MPVS;
 
+NODE MODULE_LIST;
+MODULE CUR_MODULE;
+char *CUR_FUNC;
+
 struct oF oF_TRUE,oF_FALSE;
 F F_TRUE = &oF_TRUE;  
 F F_FALSE = &oF_FALSE;
 
-#if defined(__SVR4) && defined(sun)
-char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";
-#else
-#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__)
-char cppname[BUFSIZ] = "/usr/bin/cpp ";
-#else
 #if defined(VISUAL)
 char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp ";
 #else
 char cppname[BUFSIZ] = "/lib/cpp ";
 #endif
-#endif
-#endif
 char asirname[BUFSIZ];
 char displayname[BUFSIZ];
 
 int Verbose;
+int do_quiet;
 
 void glob_init() {
 	int i;
@@ -180,7 +181,6 @@ int do_asirrc;
 int do_file;
 int do_message;
 int do_fep;
-int no_prompt;
 int read_exec_file;
 static int buserr_sav;
 static char asir_history[BUFSIZ];
@@ -211,7 +211,7 @@ void asir_terminate(int status)
 			LONGJMP(exec_env,status);
 	} else {
 		tty_reset();
-#if MPI
+#if defined(MPI)
 		if ( !mpi_myid )
 			close_allconnections();
 		mpi_finalize();
@@ -241,10 +241,16 @@ void param_init() {
 	else
 		little_endian = 0;
 }
-	
+
+Obj user_defined_prompt;
+
 void prompt() {
-	if ( !no_prompt && !do_fep && asir_infile->fp == stdin )
+	if ( !do_quiet && !do_fep && asir_infile->fp == stdin )
 		fprintf(asir_out,"[%d] ",APVS->n);
+	else if ( do_quiet && user_defined_prompt 
+		&& OID(user_defined_prompt)==O_STR) {
+		fprintf(asir_out,BDY((STRING)user_defined_prompt),APVS->n);
+	}
 	fflush(asir_out);
 }
 
@@ -253,14 +259,56 @@ void sprompt(char *ptr)
 	sprintf(ptr,"[%d] ",APVS->n);
 }
 
+#if !defined(VISUAL)
+static int which(char *prog, char *path, char *buf, size_t size)
+{
+    char *tok;
+    char delim[] = ":";
+    char *path2  = malloc(strlen(path)+1);
+    char *name   = malloc(size);
+    int  proglen = strlen(prog)+3; /* "/" + prog + " \0" */
+
+    if (!name || !path2) {
+        return 0;
+    }
+    strcpy(path2, path);
+    tok = strtok(path2, delim);
+    while (tok != NULL) {
+        if (size >= strlen(tok)) {
+            sprintf(name, "%s/%s", tok, prog);
+            if (access(name, X_OK&R_OK) == 0) {
+                strcpy(buf, name);
+                strcat(buf, " ");
+                free(path2); free(name);
+                return 1;
+            }
+            tok = strtok(NULL, delim);
+        }
+    }
+    free(path2); free(name);
+    return 0;
+}
+#endif
+
+void cppname_init()
+{
+#if !defined(VISUAL)
+    if (access(cppname, X_OK&R_OK) != 0) {
+        which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) ||
+        which("cpp", getenv("PATH"), cppname, BUFSIZ);
+    }
+#endif
+}
+
 FILE *in_fp;
 
 void process_args(int ac,char **av)
 {
 	do_asirrc = 1;
-#if !MPI
+#if !defined(MPI)
 	do_message = 1;
 #endif
+	do_quiet = 0;
 	while ( ac > 0 ) {
 		if ( !strcmp(*av,"-heap") && (ac >= 2) ) {
 			void GC_expand_hp(int);
@@ -279,6 +327,7 @@ void process_args(int ac,char **av)
 		} else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) {
 			strcpy(cppname,*(av+1)); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-f") && (ac >= 2) ) {
+			do_quiet = 1;
 			in_fp = fopen(*(av+1),"r");
 			if ( !in_fp ) {
 				fprintf(stderr,"%s does not exist!",*(av+1));
@@ -286,12 +335,12 @@ void process_args(int ac,char **av)
 			}
 			do_file = 1;
 			av += 2; ac -= 2;
+		} else if ( !strcmp(*av,"-quiet") ) {
+			do_quiet = 1; av++; ac--;
 		} else if ( !strcmp(*av,"-norc") ) {
 			do_asirrc = 0; av++; ac--;
 		} else if ( !strcmp(*av,"-nomessage") ) {
 			do_message = 0; av++; ac--;
-		} else if ( !strcmp(*av,"-terse") ) {
-			no_prompt = 0; av++; ac--;
 		} else if ( !strcmp(*av,"-rootdir") && (ac >= 2) ) {
 			set_rootdir(*(av+1)); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-maxheap") && (ac >= 2) ) {
@@ -590,7 +639,7 @@ SNODE error_snode;
 
 void error(char *s)
 {
-	SNODE *snp;
+	SNODE *snp=0;
 
 #if !defined(VISUAL)
 	if ( timer_is_set )
@@ -599,7 +648,7 @@ void error(char *s)
 	fprintf(stderr,"%s\n",s);
 	set_lasterror(s);
 	if ( CPVS != GPVS ) {
-		if ( CPVS->usrf && CPVS->usrf && CPVS->usrf->f.usrf )
+		if ( CPVS && CPVS->usrf && CPVS->usrf->f.usrf )
 			searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp);
 		if ( snp )
 			error_snode = *snp;