--- gforth/prim	2004/03/29 13:54:14	1.152
+++ gforth/prim	2005/01/04 22:09:03	1.157
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -324,7 +324,10 @@ INST_TAIL;
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
+INST_TAIL;
+NEXT_P2;
 #endif
+SUPER_CONTINUE;  /* we do our own control flow, so don't append NEXT etc. */
 :
  r> @ >r ;
 
@@ -988,12 +991,20 @@ w2 = ~w1;
 
 rshift	( u1 n -- u2 )		core	r_shift
 ""Logical shift right by @i{n} bits.""
-  u2 = u1>>n;
+#ifdef BROKEN_SHIFT
+  u2 = rshift(u1, n);
+#else
+  u2 = u1 >> n;
+#endif
 :
     0 ?DO 2/ MAXI and LOOP ;
 
 lshift	( u1 n -- u2 )		core	l_shift
-  u2 = u1<<n;
+#ifdef BROKEN_SHIFT
+  u2 = lshift(u1, n);
+#else
+  u2 = u1 << n;
+#endif
 :
     0 ?DO 2* LOOP ;
 
@@ -1590,16 +1601,8 @@ SUPER_END;
 return (Label *)n;
 
 (system)	( c_addr u -- wretval wior )	gforth	paren_system
-#ifndef MSDOS
-int old_tp=terminal_prepped;
-deprep_terminal();
-#endif
-wretval=system(cstr(c_addr,u,1)); /* ~ expansion on first part of string? */
+wretval = gforth_system(c_addr, u);  
 wior = IOR(wretval==-1 || (wretval==127 && errno != 0));
-#ifndef MSDOS
-if (old_tp)
-  prep_terminal();
-#endif
 
 getenv	( c_addr1 u1 -- c_addr2 u2 )	gforth
 ""The string @i{c-addr1 u1} specifies an environment variable. The string @i{c-addr2 u2}
@@ -1845,6 +1848,21 @@ char * string = cstr(c_addr1, u1, 1);
 char * pattern = cstr(c_addr2, u2, 0);
 flag = FLAG(!fnmatch(pattern, string, 0));
 
+set-dir	( c_addr u -- wior )	gforth set_dir
+""Change the current directory to @i{c-addr, u}.
+Return an error if this is not possible""
+wior = IOR(chdir(tilde_cstr(c_addr, u, 1)));
+
+get-dir	( c_addr1 u1 -- c_addr2 u2 )	gforth get_dir
+""Store the current directory in the buffer specified by @{c-addr1, u1}.
+If the buffer size is not sufficient, return 0 0""
+c_addr2 = getcwd(c_addr1, u1);
+if(c_addr2 != NULL) {
+  u2 = strlen(c_addr2);
+} else {
+  u2 = 0;
+}
+
 \+
 
 newline	( -- c_addr u )	gforth