===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.1.1.1
retrieving revision 1.11
diff -u -p -r1.1.1.1 -r1.11
--- OpenXM_contrib2/asir2000/parse/glob.c	1999/12/03 07:39:12	1.1.1.1
+++ OpenXM_contrib2/asir2000/parse/glob.c	2000/11/08 06:21:18	1.11
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/parse/glob.c,v 1.2 1999/11/17 08:57:10 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.10 2000/08/28 06:13:15 noro Exp $ 
+*/
 #include "ca.h"
 #include "al.h"
 #include "parse.h"
@@ -87,19 +135,19 @@ F F_TRUE = &oF_TRUE;  
 F F_FALSE = &oF_FALSE;
 
 #if defined(__SVR4) && defined(sun)
-char cppname[64] = "/usr/ccs/lib/cpp ";
+char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";
 #else
 #if defined(__FreeBSD__) || defined(__NetBSD__)
-char cppname[64] = "/usr/bin/cpp ";
+char cppname[BUFSIZ] = "/usr/bin/cpp ";
 #else
 #if defined(VISUAL)
-char cppname[64] = "c:\\asir\\stdlib\\cpp ";
+char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp ";
 #else
-char cppname[64] = "/lib/cpp ";
+char cppname[BUFSIZ] = "/lib/cpp ";
 #endif
 #endif
 #endif
-char asirname[64];
+char asirname[BUFSIZ];
 char displayname[BUFSIZ];
 
 int Verbose;
@@ -152,6 +200,12 @@ static char asir_history[BUFSIZ];
 
 extern int mpi_myid;
 
+#if !defined(VISUAL_LIB)
+void ExitAsir() {
+	exit(0);
+}
+#endif
+
 /*
  * status = 1 abnormal termination (error() etc.)
  * status = 2 normal termination (end(), quit() etc.)
@@ -301,6 +355,8 @@ char **av;
 			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) ) {
 			void GC_set_max_heap_size(int);
 
@@ -435,6 +491,13 @@ int sig;
 #if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__)
 	signal(SIGINT,SIG_IGN);
 #endif
+#if !defined(VISUAL) 
+    if ( do_server_in_X11 ) {
+		debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0);
+ 		restore_handler();
+		return;
+	}
+#endif
 #if defined(linux)
 #if 1
 	while ( stdin->_IO_read_ptr < stdin->_IO_read_end )
@@ -660,8 +723,12 @@ char *s;
 	fprintf(stderr,"%s\n",s);
 	set_lasterror(s);
 	if ( CPVS != GPVS ) {
-		searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp);
-		error_snode = *snp;
+		if ( CPVS->usrf && CPVS->usrf && CPVS->usrf->f.usrf )
+			searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp);
+		if ( snp )
+			error_snode = *snp;
+		else
+			error_snode = 0;
 	} else
 		error_snode = 0;
 	if ( do_file ) {
@@ -714,7 +781,8 @@ void reset_timer()
 unsigned int get_asir_version();
 
 void copyright() {
-	printf("This is Asir, Version %d.\n",get_asir_version());
+	printf("This is Risa/Asir, Version %d.\n",get_asir_version());
 	printf("Copyright (C) FUJITSU LABORATORIES LIMITED.\n");
-	printf("3 March 1994. All rights reserved.\n");
+	printf("1994-2000. All rights reserved.\n");
 }
+