===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/11/08 08:44:13	1.8
+++ OpenXM_contrib2/asir2000/builtin/file.c	2000/12/05 01:24:50	1.11
@@ -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/builtin/file.c,v 1.7 2000/11/08 06:21:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.10 2000/11/13 01:48:12 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -57,6 +57,7 @@
 
 #if defined(VISUAL)
 #include <windows.h>
+#include <process.h>
 /* #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\WinECgen\\1.00.000" */
 #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\FSEcParamGen\\V1.0L10"
 #define ASIR_KEYNAME "SoftWare\\Fujitsu\\Asir\\1999.03.31"
@@ -71,15 +72,17 @@ void Pbsave(), Pbload(), Pbload27();
 void Pbsave_compat(), Pbload_compat();
 void Pbsave_cmo(), Pbload_cmo();
 void Popen_file(), Pclose_file(), Pget_line(), Pget_byte();
+void Ppurge_stdin();
 
 extern int des_encryption;
 extern char *asir_libdir;
 
 struct ftab file_tab[] = {
+	{"purge_stdin",Ppurge_stdin,0},
 	{"open_file",Popen_file,1},
 	{"close_file",Pclose_file,1},
 	{"get_byte",Pget_byte,1},
-	{"get_line",Pget_line,1},
+	{"get_line",Pget_line,-1},
 	{"remove_file",Premove_file,1},
 	{"access",Paccess,1},
 	{"load",Pload,-1},
@@ -103,6 +106,13 @@ struct ftab file_tab[] = {
 
 static FILE *file_ptrs[BUFSIZ];
 
+void Ppurge_stdin(rp)
+Q *rp;
+{
+	purge_stdin(stdin);
+	*rp = 0;
+}
+
 void Popen_file(arg,rp)
 NODE arg;
 Q *rp;
@@ -150,7 +160,21 @@ STRING *rp;
 	FILE *fp;
 	fpos_t head;
 	char *str;
+	char buf[BUFSIZ];
 
+	if ( !arg ) {
+#if defined(VISUAL_LIB)
+		get_string(buf,sizeof(buf));
+#else
+		fgets(buf,sizeof(buf),stdin);
+#endif
+		i = strlen(buf);
+		str = (char *)MALLOC_ATOMIC(i+1);	
+		strcpy(str,buf);
+		MKSTR(*rp,str);
+		return;
+	}
+
 	asir_assert(ARG0(arg),O_N,"get_line");
 	i = QTOS((Q)ARG0(arg));
 	if ( fp = file_ptrs[i] ) {
@@ -209,11 +233,6 @@ Q *rp;
 	char *name,*name0;
 	char errbuf[BUFSIZ];
 
-#if defined THINK_C
-	if ( !arg ) {
-		ret = finder_loadfile();
-	} else
-#endif
 	if ( ARG0(arg) ) {
 		switch (OID(ARG0(arg))) {
 			case O_STR:
@@ -317,11 +336,7 @@ Q *rp;
 	for ( t = vl; t; t = NEXT(t) )
 		if ( t->v->attr == (pointer)V_UC )
 			error("bsave : not implemented");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -339,11 +354,7 @@ Obj *rp;
 	FILE *fp;
 
 	asir_assert(ARG0(arg),O_STR,"bload");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -361,11 +372,7 @@ Q *rp;
 	VL vl,t;
 
 	asir_assert(ARG1(arg),O_STR,"bsave_cmo");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave_cmo : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -382,11 +389,7 @@ Obj *rp;
 	FILE *fp;
 
 	asir_assert(ARG0(arg),O_STR,"bload_cmo");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload_cmo : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -506,11 +509,7 @@ Obj *rp;
 	Obj r;
 
 	asir_assert(ARG0(arg),O_STR,"bload27");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	loadvl(fp);
@@ -531,11 +530,7 @@ Q *rp;
 	for ( t = vl; t; t = NEXT(t) )
 		if ( t->v->attr == (pointer)V_UC )
 			error("bsave : not implemented");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave : invalid filename");
 	/* indicator of an asir32 file */
@@ -556,11 +551,7 @@ Obj *rp;
 	int c;
 
 	asir_assert(ARG0(arg),O_STR,"bload_compat");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	fread(hdr,sizeof(unsigned int),2,fp);
@@ -610,3 +601,17 @@ Q *rp;
 	else
 		*rp = 0;
 }
+
+#if defined(VISUAL)
+int process_id()
+{
+	return GetCurrentProcessId();
+}
+
+void call_exe(name,av)
+char *name;
+char **av;
+{
+	_spawnv(_P_WAIT,name,av);
+}
+#endif