===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/miscf.c,v
retrieving revision 1.26
retrieving revision 1.33
diff -u -p -r1.26 -r1.33
--- OpenXM_contrib2/asir2000/builtin/miscf.c	2006/02/08 02:11:19	1.26
+++ OpenXM_contrib2/asir2000/builtin/miscf.c	2015/03/16 00:08:32	1.33
@@ -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.25 2004/11/16 01:47:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.32 2013/11/05 02:55:03 noro 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();
@@ -77,8 +83,11 @@ void Pmodule_definedp();
 void Ptest();
 
 void delete_history(int,int);
+void grab_pointer();
 
 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 +127,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;
@@ -242,7 +277,7 @@ NODE arg;
 STRING *rp;
 {
 	char *e,*f;
-	int len;
+	size_t len;
 
 	e = (char *)getenv(BDY((STRING)ARG0(arg)));
 	if ( e ) {
@@ -321,7 +356,9 @@ void Pheap(arg,rp)
 NODE arg;
 Q *rp;
 {
-	int h0,h;
+	size_t h0,h;
+	unsigned int u,l;
+	N n;
 	void GC_expand_hp(int);
 	
 	h0 = get_heapsize();
@@ -331,7 +368,16 @@ Q *rp;
 			GC_expand_hp(h-h0);
 	}
 	h = get_heapsize();
-	STOQ(h,*rp);
+	if(sizeof(size_t)>sizeof(int)) {
+		u = h>>(sizeof(int)*CHAR_BIT); l = h&(~0);
+		if ( !u ) UTOQ(l,*rp);
+		else {
+			n = NALLOC(2); PL(n)=2; BD(n)[0] = l; BD(n)[1] = u;
+			NTOQ(n,1,*rp);
+		}
+	}else {
+		UTOQ(h,*rp);
+	}
 }
 
 unsigned int get_asir_version();
@@ -402,7 +448,7 @@ Q *rp;
 		s = "";
 	else
 		s = BDY((STRING)ARG0(arg));
-	toplevel(s);
+	goto_toplevel(s);
 	*rp = 0;
 }
 
@@ -564,7 +610,7 @@ init_display()
 	rootwin = RootWindow(display,DefaultScreen(display));
 }
 
-grab_pointer()
+void grab_pointer()
 {
 	XEvent ev;
 	static Cursor cursor;