===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/parse/debug.c	2000/08/21 08:31:46	1.4
+++ OpenXM_contrib2/asir2000/parse/debug.c	2000/12/22 10:03:31	1.7
@@ -23,7 +23,7 @@
  * 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@flab.fujitsu.co.jp of the detailed specification
+ * 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.
  * 
@@ -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/debug.c,v 1.3 2000/07/13 05:09:03 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.6 2000/12/05 01:24:56 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -153,16 +153,12 @@ void debug_init() {
 	for ( n = 0; dckwd[n].id != D_UNKNOWN; n++ );
 	for ( i = 0; i < n; i++ )
 		MKNODE(dckwd[i].names,debcom[i],0);
-#if defined(THINK_C)
-	strcpy(buf,"dbxinit");
-#else
 	home = (char *)getenv("HOME");
 	if ( home )
 		strcpy(buf,home);
 	else
 		buf[0] = 0;
 	strcat(buf,"/.dbxinit");
-#endif
 	if ( (fp = fopen(".dbxinit","r")) || (fp = fopen(buf,"r")) ) {
 		while ( fgets(buf,BUFSIZ,fp) ) {
 			stoarg(buf,&ac,av);
@@ -231,7 +227,7 @@ SNODE f;
 #endif
 	char buf[BUFSIZ];
 	char prompt[BUFSIZ];
-	char *p,*pe;
+	char *p,*pe,*line;
 	NODE tn;
 	extern int kernelmode,do_fep;
 	NODE pvss;
@@ -243,7 +239,7 @@ SNODE f;
 		else
 			return;
 #endif
-#if defined(VISUAL) || defined(THINK_C)
+#if defined(VISUAL)
 	suspend_timer();
 #endif
 	pvss = PVSS; debug_mode = 1;
@@ -256,10 +252,19 @@ SNODE f;
 		fputc('\0',stderr);
 	setjmp(debug_env);
 	while ( 1 ) {
-		if ( !do_server_in_X11 )
-			fputs(prompt,stderr);
+#if FEP
+		if ( !do_fep )
+#endif
+			if ( !do_server_in_X11 )
+				fputs(prompt,stderr);
 		bzero(buf,BUFSIZ);
 		while ( 1 ) {
+#if FEP
+			if ( do_fep ) {
+				line = (char *)readline_console(prompt);
+				strcpy(buf,line); free(line);
+			} else
+#endif
 			{
 				int len;
 
@@ -358,10 +363,7 @@ LAST:
 	if ( kernelmode )
 		fputc('\0',stderr);
 	debug_mode = 0;
-#if defined(THINK_C)
-	show_debug_window(0);
-	resume_timer();
-#elif !defined(VISUAL)
+#if !defined(VISUAL)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(0);
@@ -746,9 +748,6 @@ int l;
 	int i;
 	int ln;
 	FUNC r;
-#if defined(THINK_C)
-	void setDir(short);
-#endif
 
 	if ( !ac )
 		ln = curline;
@@ -766,13 +765,7 @@ int l;
 	}
 	if ( !targetf )
 		return;
-#if defined(THINK_C)
-	setDir(targetf->f.usrf->vol);
-#endif
 	fp = fopen(targetf->f.usrf->fname,"r");
-#if defined(THINK_C)
-	resetDir();
-#endif
 	if ( !fp ) {
 		fprintf(stderr,"\"%s\" not found\n",targetf->name);
 		return;