===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/miscf.c,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- OpenXM_contrib2/asir2000/builtin/miscf.c	2004/03/11 09:53:34	1.23
+++ OpenXM_contrib2/asir2000/builtin/miscf.c	2006/02/08 02:11:19	1.26
@@ -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/miscf.c,v 1.22 2004/03/11 09:52:56 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.25 2004/11/16 01:47:31 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -59,6 +59,8 @@
 #include <windows.h>
 #endif
 
+void Pset_secure_mode();
+void Pset_secure_flag();
 void Pquit(), Pdebug(), Pnmono(), Pnez(), Popt(), Pshell(), Pheap();
 void Ptoplevel();
 void Perror(), Perror3(), Pversion(), Pcopyright(), Pflist(), Pdelete_history(), Ppause(), Pxpause();
@@ -77,6 +79,8 @@ void Ptest();
 void delete_history(int,int);
 
 struct ftab misc_tab[] = {
+	{"set_secure_mode",Pset_secure_mode,-1},
+	{"set_secure_flag",Pset_secure_flag,-2},
 	{"module_list",Pmodule_list,0},
 	{"remove_module",Premove_module,1},
 	{"module_definedp",Pmodule_definedp,1},
@@ -114,6 +118,45 @@ struct ftab misc_tab[] = {
 	{0,0,0},
 };
 
+void Pset_secure_mode(NODE arg,Q *rp)
+{
+	int s;
+	if ( argc(arg) )
+		setsecuremode(QTOS((Q)ARG0(arg)));
+	s = getsecuremode();
+	STOQ(s,*rp);
+}
+
+void Pset_secure_flag(NODE arg,Q *rp)
+{
+	int ac,s,status;
+	Obj f;
+	char *fname;
+
+	ac = argc(arg);
+	if ( !ac )
+		error("set_secure_flag : a function name must be specified");
+	if ( ac == 2 )
+		s = QTOS((Q)ARG1(arg));
+	else
+		s = 1;
+	f = ARG0(arg);
+	if ( !f )
+		error("set_secure_flag : invalid argument");
+	switch ( OID(f) ) {
+		case O_STR:
+			fname = BDY((STRING)f); break;
+		case O_P:
+			fname = NAME(VR((P)f)); break;
+		default:
+			error("set_secure_flag : invalid argument"); break;
+	}
+	status = setsecureflag(fname,s);
+	if ( status < 0 )
+		error("set_secure_flag : function not found");
+	STOQ(s,*rp);
+}
+
 void Ptest(arg,rp)
 NODE arg;
 Q *rp;
@@ -221,12 +264,11 @@ Q *rp;
 void Pquit(rp)
 pointer *rp;
 {
-	if ( !NEXT(asir_infile) )
-		asir_terminate(2); 
+	if ( asir_infile && NEXT(asir_infile) && asir_infile->ready_for_longjmp )
+		LONGJMP(asir_infile->jmpbuf,1);
 	else {
 		closecurrentinput();
-		if ( !asir_infile->fp && strcmp(asir_infile->name,"string") )
-			asir_terminate(2);
+		asir_terminate(2);
 	}
 	*rp = 0;
 }