===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/miscf.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- OpenXM_contrib2/asir2000/builtin/miscf.c	2004/10/27 08:21:47	1.24
+++ OpenXM_contrib2/asir2000/builtin/miscf.c	2010/12/25 23:10:15	1.28
@@ -45,20 +45,26 @@
  * 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.23 2004/03/11 09:53:34 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.27 2008/08/26 16:17:03 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
+#include <string.h>
 #if !defined(VISUAL) && defined(DO_PLOT)
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 #endif
 
 #if defined(VISUAL)
+#include <direct.h>
 #include <stdlib.h>
 #include <windows.h>
+#else
+#include <unistd.h>
+#include <sys/param.h>
 #endif
 
+void Pgetcwd(), Pchdir();
 void Pset_secure_mode();
 void Pset_secure_flag();
 void Pquit(), Pdebug(), Pnmono(), Pnez(), Popt(), Pshell(), Pheap();
@@ -79,6 +85,8 @@ void Ptest();
 void delete_history(int,int);
 
 struct ftab misc_tab[] = {
+	{"pwd",Pgetcwd,0},
+	{"chdir",Pchdir,1},
 	{"set_secure_mode",Pset_secure_mode,-1},
 	{"set_secure_flag",Pset_secure_flag,-2},
 	{"module_list",Pmodule_list,0},
@@ -118,6 +126,32 @@ struct ftab misc_tab[] = {
 	{0,0,0},
 };
 
+void Pgetcwd(STRING *rp)
+{
+	char *r;
+#if defined(VISUAL)
+	char buf[_MAX_PATH];
+	_getcwd(buf, _MAX_PATH);
+#else
+	char buf[MAXPATHLEN];
+	getcwd(buf, MAXPATHLEN);
+#endif
+	r = (char *)MALLOC_ATOMIC(strlen(buf)+1);
+	strcpy(r,buf);
+	MKSTR(*rp,r);
+}
+
+void Pchdir(NODE arg, Q *rp)
+{
+	char *dir = BDY((STRING)ARG0(arg));
+#if defined(VISUAL)
+	int status = _chdir(dir);
+#else
+	int status = chdir(dir);
+#endif
+	STOQ(status,*rp);
+}
+
 void Pset_secure_mode(NODE arg,Q *rp)
 {
 	int s;
@@ -129,7 +163,9 @@ void Pset_secure_mode(NODE arg,Q *rp)
 
 void Pset_secure_flag(NODE arg,Q *rp)
 {
-	int ac,s;
+	int ac,s,status;
+	Obj f;
+	char *fname;
 
 	ac = argc(arg);
 	if ( !ac )
@@ -138,7 +174,20 @@ void Pset_secure_flag(NODE arg,Q *rp)
 		s = QTOS((Q)ARG1(arg));
 	else
 		s = 1;
-	setsecureflag(BDY((STRING)ARG0(arg)),s);
+	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);
 }
 
@@ -249,12 +298,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;
 }