av

C/c_interface.c

@@ -251,7 +251,7 @@ X_API YAP_Bool YAP_IsAtomTerm(Term t) { return (IsAtomTerm(t)); }
 X_API YAP_Bool YAP_IsPairTerm(Term t) { return (IsPairTerm(t)); }
 
 X_API YAP_Bool YAP_IsApplTerm(Term t) {
-  return (IsApplTerm(t) && !IsExtensionFunctor(FunctorOfTerm(t)));
+  return IsApplTerm(t) && !IsExtensionFunctor(FunctorOfTerm(t));
 }
 
 X_API YAP_Bool YAP_IsCompoundTerm(Term t) {
@@ -1901,8 +1901,8 @@ X_API Int YAP_RunGoalOnce(Term t) {
 
 X_API bool YAP_RestartGoal(void) {
   CACHE_REGS
-  bool out;
   BACKUP_MACHINE_REGS();
+  bool out;
   if (LOCAL_AllowRestart) {
     P = (yamop *)FAILCODE;
     LOCAL_PrologMode = UserMode;
@@ -2009,7 +2009,7 @@ X_API void YAP_ClearExceptions(void) {
 
 X_API int YAP_InitConsult(int mode, const char *filename, int *osnop) {
   CACHE_REGS
-  FILE *f;
+    FILE *f;
   int sno;
   char full[FILENAME_MAX] BACKUP_MACHINE_REGS();
 
@@ -2241,21 +2241,37 @@ static void do_bootfile(char *bootfilename USES_REGS) {
 #endif
 }
 
-static void construct_init_file(char *boot_file, char *BootFile) {
-/* trust YAPSHAREDIR over YAP_PL_SRCDIR, and notice that the code is /
+/* trust YAPSHAREDIR over YAP_PL_SRCDIR, and notice that the code is
  * dependent. */
+static bool construct_init_file(char *boot_file, char *BootFile)
+{
 #if HAVE_GETENV
   if (getenv("YAPSHAREDIR")) {
     strncpy(boot_file, getenv("YAPSHAREDIR"), 256);
     strncat(boot_file, "/pl/", 255);
-  } else {
-#endif
-    strncpy(boot_file, YAP_PL_SRCDIR, 256);
-    strncat(boot_file, "/", 255);
-#if HAVE_GETENV
+    if (Yap_Exists( boot_file ) ) {
+      return true;
+    }
   }
 #endif
+#if __ANDROID__
+  strncpy(boot_file, "/assets/share/pl/", 256);
+  if (Yap_Exists( boot_file ) ) {
+    return true;
+  }
+#endif
+  strncpy(boot_file, YAP_SHAREDIR "/pl/" , 256);
   strncat(boot_file, BootFile, 255);
+  if (Yap_Exists( boot_file ) ) {
+    return true;
+  }
+
+  strncpy(boot_file, YAP_PL_SRCDIR "/", 256);
+  strncat(boot_file, BootFile, 255);
+  if (Yap_Exists( boot_file ) ) {
+    return true;
+  }
+  return false;
 }
 
 /* this routine is supposed to be called from an external program
@@ -2353,25 +2369,22 @@ Int YAP_Init(YAP_init_args *yap_init) {
     Yap_ExecutionMode = yap_init->ExecutionMode;
     if (do_bootstrap) {
       restore_result = YAP_BOOT_FROM_PROLOG;
-    } else if (BOOT_FROM_SAVED_STATE) {
-      restore_result = Yap_Restore(yap_init->SavedState, yap_init->YapLibDir);
-      if (restore_result == FAIL_RESTORE) {
-        yap_init->ErrorNo = LOCAL_Error_TYPE;
-        yap_init->ErrorCause = LOCAL_ErrorMessage;
-        /* shouldn't RECOVER_MACHINE_REGS();  be here ??? */
-        return YAP_BOOT_ERROR;
-      }
-    } else {
-      restore_result = YAP_BOOT_FROM_PROLOG;
-    }
-    if (BOOT_FROM_SAVED_STATE && !do_bootstrap) {
+    } else { // try always to boot from the saved state.
+     if (restore_result != YAP_BOOT_FROM_PROLOG) {
       if (!Yap_SavedInfo(yap_init->SavedState, yap_init->YapLibDir, &Trail,
                          &Stack, &Heap)) {
+	restore_result = YAP_BOOT_FROM_PROLOG;
         yap_init->ErrorNo = LOCAL_Error_TYPE;
         yap_init->ErrorCause = LOCAL_ErrorMessage;
         return YAP_BOOT_ERROR;
       }
     }
+     restore_result = Yap_Restore(yap_init->SavedState, yap_init->YapLibDir);
+      if (restore_result == FAIL_RESTORE) {
+	restore_result = YAP_BOOT_FROM_PROLOG;
+      }
+    }
+ 
     GLOBAL_FAST_BOOT_FLAG = yap_init->FastBoot;
 #if defined(YAPOR) || defined(TABLING)
     Yap_init_root_frames();
@@ -2444,17 +2457,8 @@ Int YAP_Init(YAP_init_args *yap_init) {
   if (yap_init->QuietMode) {
     setVerbosity(TermSilent);
   }
-  if (BOOT_FROM_SAVED_STATE && !do_bootstrap) {
-    if (restore_result == FAIL_RESTORE) {
-      yap_init->ErrorNo = LOCAL_Error_TYPE;
-      yap_init->ErrorCause = LOCAL_ErrorMessage;
-      return YAP_BOOT_ERROR;
-    }
-    if (Atts && Atts * 1024 > 2048 * sizeof(CELL))
-      Yap_AttsSize = Atts * 1024;
-    else {
-      Yap_AttsSize = 2048 * sizeof(CELL);
-    }
+  if (restore_result == DO_EVERYTHING ||
+      restore_result == DO_ONLY_CODE) {
     LOCAL_PrologMode &= ~BootMode;
     if (restore_result == DO_ONLY_CODE) {
       /* first, initialize the saved state */
@@ -2465,38 +2469,37 @@ Int YAP_Init(YAP_init_args *yap_init) {
       CurrentModule = LOCAL_SourceModule = USER_MODULE;
       return YAP_BOOT_FROM_SAVED_STACKS;
     }
-  } else {
-
-    /* read the bootfile */
-    if (!do_bootstrap) {
-      construct_init_file(boot_file, BootFile);
-      yap_init->YapPrologBootFile = boot_file;
-    }
-    do_bootfile(yap_init->YapPrologBootFile ? yap_init->YapPrologBootFile
-                                            : BootFile PASS_REGS);
-    /* initialize the top-level */
-    if (!do_bootstrap) {
-      char init_file[256];
-      Atom atfile;
-      Functor fgoal;
-      YAP_Term goal, as[2];
-      construct_init_file(init_file, InitFile);
-      /* consult init file */
-      atfile = Yap_LookupAtom(init_file);
-      as[0] = MkAtomTerm(atfile);
-      fgoal = Yap_MkFunctor(Yap_FullLookupAtom("$silent_bootstrap"), 1);
-      goal = Yap_MkApplTerm(fgoal, 1, as);
-      /* launch consult */
-      YAP_RunGoalOnce(goal);
-      /* set default module to user */
-      as[0] = MkAtomTerm(AtomUser);
-      fgoal = Yap_MkFunctor(Yap_LookupAtom("module"), 1);
-      goal = Yap_MkApplTerm(fgoal, 1, as);
-      YAP_RunGoalOnce(goal);
-    }
-    Yap_PutValue(Yap_FullLookupAtom("$live"),
-                 MkAtomTerm(Yap_FullLookupAtom("$true")));
   }
+  /* read the bootfile */
+  if (!do_bootstrap) {
+    construct_init_file(boot_file, BootFile);
+    yap_init->YapPrologBootFile = boot_file;
+  }
+  do_bootfile(yap_init->YapPrologBootFile ? yap_init->YapPrologBootFile
+                                            : BootFile PASS_REGS);
+  /* initialize the top-level */
+  if (!do_bootstrap) {
+    char init_file[256];
+    Atom atfile;
+    Functor fgoal;
+    YAP_Term goal, as[2];
+    if (!construct_init_file(init_file, InitFile))
+      Yap_exit(1);
+    /* consult init file */
+    atfile = Yap_LookupAtom(init_file);
+    as[0] = MkAtomTerm(atfile);
+    fgoal = Yap_MkFunctor(Yap_FullLookupAtom("$silent_bootstrap"), 1);
+    goal = Yap_MkApplTerm(fgoal, 1, as);
+    /* launch consult */
+    YAP_RunGoalOnce(goal);
+    /* set default module to user */
+    as[0] = MkAtomTerm(AtomUser);
+    fgoal = Yap_MkFunctor(Yap_LookupAtom("module"), 1);
+    goal = Yap_MkApplTerm(fgoal, 1, as);
+    YAP_RunGoalOnce(goal);
+  }
+  Yap_PutValue(Yap_FullLookupAtom("$live"),
+	       MkAtomTerm(Yap_FullLookupAtom("$true")));
   return YAP_BOOT_FROM_PROLOG;
 }
 
@@ -2513,7 +2516,7 @@ Int Yap_InitDefaults(YAP_init_args *init_args, char saved_state[]) {
   init_args->MaxTrailSize = 0;
   init_args->YapLibDir = NULL;
 #if __ANDROID__
-  init_args->YapPrologBootFile = "pl/boot.yap";
+  init_args->YapPrologBootFile = "boot.yap";
   init_args->YapPrologInitGoal = "bootstrap";
 #else
   init_args->YapPrologBootFile = NULL;

C/flags.c

@@ -586,7 +586,7 @@ static void initFlag(flag_info *f, int fnum, bool global) {
 static bool executable(Term inp) {
   CACHE_REGS
     if (GLOBAL_argv && GLOBAL_argv[0]) {
-      if (!Yap_AbsoluteFileInBuffer(GLOBAL_argv[0], LOCAL_FileNameBuf, YAP_FILENAME_MAX - 1,true))
+      if (!Yap_AbsoluteFile(GLOBAL_argv[0], LOCAL_FileNameBuf,true))
 	return false;
     } else
     strncpy(LOCAL_FileNameBuf, Yap_FindExecutable(), YAP_FILENAME_MAX - 1);

C/init.c

@@ -413,7 +413,11 @@ static void InitDebug(void) {
   if (Yap_output_msg) {
     char ch;
 
-#if HAVE_ISATTY
+#if _WIN32
+    if (!_isatty( _fileno( stdin ) )) {
+      return;
+    }
+#elif HAVE_ISATTY
     if (!isatty(0)) {
       return;
     }
@@ -423,9 +427,11 @@ static void InitDebug(void) {
     fprintf(stderr, "a getch\t\tb token\t\tc Lookup\td LookupVar\ti Index\n");
     fprintf(stderr, "e SetOp\t\tf compile\tg icode\t\th boot\t\tl log\n");
     fprintf(stderr, "m Machine\t p parser\n");
-    while ((ch = putchar(getchar())) != '\n')
+    while ((ch = putchar(getchar())) != '\n' && ch != '\r') {
       if (ch >= 'a' && ch <= 'z')
         GLOBAL_Option[ch - 'a' + 1] = 1;
+      GLOBAL_Option[ch - 'a' + 1] = 1;
+    }
     if (GLOBAL_Option['l' - 96]) {
       GLOBAL_logfile = fopen(LOGFILE, "w");
       if (GLOBAL_logfile == NULL) {

CXX/CMakeLists.txt

@@ -15,9 +15,9 @@ set (CXX_SOURCES
 )
 
 
-if (YAP_SINGLE_FILE)
+if (YAP_SINGLE_FILE OR WIN32)
 add_library (Yap++ OBJECT ${CXX_SOURCES} )
-else(YAP_SINGLE_FILE)
+else(YAP_SINGLE_FILE OR WIN32)
 add_library (Yap++ SHARED ${CXX_SOURCES} )
 
 target_link_libraries(Yap++ ${CMAKE_DL_LIBS} libYap)
@@ -26,7 +26,7 @@ install(TARGETS  Yap++
   LIBRARY DESTINATION ${libdir}
   ARCHIVE DESTINATION ${libdir}
   )
-endif(YAP_SINGLE_FILE)
+endif(YAP_SINGLE_FILE OR WIN32)
 
 include_directories (H include ${CMAKE_BINARY_DIR} ${GMP_INCLUDE_DIR})
 

CXX/yapt.hh

@@ -1,6 +1,3 @@
-#ifndef __unix__
-#define X_API
-#endif
 
 #ifndef YAPT_HH
 #define YAPT_HH 1

config.h.cmake

@@ -1904,7 +1904,7 @@ significant byte first (like Motorola and SPARC, unlike Intel). */
 #endif
 
 #ifndef YAP_PL_SRCDIR
-#define YAP_PL_SRCDIR "${PROJECT_SOURCE_DIR}/pl}"
+#define YAP_PL_SRCDIR "${PROJECT_SOURCE_DIR}/pl"
 #endif
 
 #ifndef YAP_SHAREDIR

os/console.c

@@ -95,13 +95,18 @@ void Yap_ConsoleOps(StreamDesc *s) {
 /* static */
 static int ConsolePutc(int sno, int ch) {
   StreamDesc *s = &GLOBAL_Stream[sno];
-#if MAC || _MSC_VER || defined(__MINGW32__)
   if (ch == 10) {
+#if MAC || _WIN32
+    fputs("\n", s->file);
+#else
     putc('\n', s->file);
+#endif
     LOCAL_newline = true;
   } else
-#endif
     putc(ch, s->file);
+#if MAC || _WIN32
+  fflush( NULL );
+#endif
   console_count_output_char(ch, s);
   return ((int)ch);
 }
@@ -133,6 +138,7 @@ restart:
 #endif
   LOCAL_PrologMode |= ConsoleGetcMode;
   ch = fgetc(s->file);
+  printf("got %d\n", ch);
 #if HAVE_SIGINTERRUPT
   siginterrupt(SIGINT, FALSE);
 #endif

os/files.c

@@ -270,10 +270,14 @@ static Int time_file(USES_REGS1) {
     HANDLE hdl;
     Term rc;
 
-    if ((hdl = CreateFile(n, 0, 0, NULL, OPEN_EXISTING, 0, 0)) == 0)
+    if ((hdl = CreateFile(n, 0, 0, NULL, OPEN_EXISTING, 0, 0)) == 0) {
+      Yap_WinError("in time_file");
       return false;
-    if (GetFileTime(hdl, NULL, NULL, &ft))
+    }
+    if (GetFileTime(hdl, NULL, NULL, &ft) == 0) {
+      Yap_WinError("in time_file");
       return false;
+    }
     // Convert the last-write time to local time.
     // FileTimeToSystemTime(&ftWrite, &stUTC);
     // SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal);
@@ -548,9 +552,11 @@ static Int file_directory_name(USES_REGS1) { /* file_directory_name(Stream,N) */
 #else
     char s[YAP_FILENAME_MAX + 1];
     Int i = strlen(c);
-    while (i && !Yap_dir_separator((int)c[--i]))
-      ;
-    strncpy(s, c, i);
+    strncpy(s, c, YAP_FILENAME_MAX);
+    while (--i) {
+      if (Yap_dir_separator((int)c[i]))
+	break;
+    }
     s[i] = '\0';
 #endif
     return Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom(s)));

os/iopreds.h

@@ -451,4 +451,7 @@ extern FILE *Yap_stdout;
 extern FILE *Yap_stderr;
 
 char *Yap_MemExportStreamPtr(int sno);
+
+bool Yap_Exists(const char *f);
+
 #endif

os/mem.c

@@ -133,7 +133,7 @@ int Yap_open_buf_read_stream(const char *nbuf, size_t nchars, encoding_t *encp,
   st->file = f = fmemopen((void *)nbuf, nchars, "r");
   flags = Input_Stream_f | InMemory_Stream_f | Seekable_Stream_f;
 #else
-  sT->file =  f = NULL;
+  st->file =  f = NULL;
   flags = Input_Stream_f | InMemory_Stream_f;
 #endif
   Yap_initStream(sno, f, NULL, TermNil, encoding, flags, AtomRead);

os/sysbits.c

@@ -183,16 +183,16 @@ static bool is_directory(const char *FileName) {
 #endif
 }
 
-/// has_access just calls access
-/// it uses F_OK, R_OK and friend
-static bool has_access(const char *FileName, int mode) {
-#ifdef __ANDROID__
-  if (Yap_isAsset(FileName)) {
-    return Yap_AccessAsset(FileName, mode);
+bool Yap_Exists(const char *f) {
+#if _WIN32
+  if (_access(f, 0) == 0)
+    return true;
+  if (errno == EINVAL) {
+    Yap_Error(SYSTEM_ERROR_INTERNAL, TermNil, "bad flags to access");
   }
-#endif
-#if HAVE_ACCESS
-  if (access(FileName, mode) == 0)
+  return false;
+#elif HAVE_ACCESS
+  if (access(FileName, F_OK) == 0)
     return true;
   if (errno == EINVAL) {
     Yap_Error(SYSTEM_ERROR_INTERNAL, TermNil, "bad flags to access");
@@ -205,14 +205,6 @@ static bool has_access(const char *FileName, int mode) {
 #endif
 }
 
-static bool exists(const char *f) {
-#if _MSC_VER
-  return has_access(f, 00);
-#else
-  return has_access(f, F_OK);
-#endif
-}
-
 static int dir_separator(int ch) {
 #ifdef MAC
   return (ch == ':');
@@ -358,7 +350,7 @@ static const char *PlExpandVars(const char *source, const char *root,
   return result;
 }
 
-#if _WIN32 || defined(__MINGW32__)
+#if _WIN32
 // straightforward conversion from Unix style to WIN style
 // check cygwin path.cc for possible improvements
 static char *unix2win(const char *source, char *target, int max) {
@@ -454,9 +446,11 @@ static bool ChDir(const char *path) {
     GLOBAL_AssetsWD = NULL;
   }
 #endif
-#if _WIN32 || defined(__MINGW32__)
-
-  if ((rc = (SetCurrentDirectory(qpath) != 0)) == 0) {
+#if _WIN32
+  rc = true;
+  if (qpath != NULL &&
+      qpath[0] &&
+      (rc = (SetCurrentDirectory(qpath) != 0)) == 0) {
     Yap_WinError("SetCurrentDirectory failed");
   }
 #else
@@ -466,44 +460,15 @@ static bool ChDir(const char *path) {
     free((char *)qpath);
   return rc;
 }
-#if _WIN32 || defined(__MINGW32__)
-char *BaseName(const char *X) {
-  char *qpath = unix2win(X, NULL, YAP_FILENAME_MAX);
-  char base[YAP_FILENAME_MAX], ext[YAP_FILENAME_MAX];
-  _splitpath(qpath, NULL, NULL, base, ext);
-  strcpy(qpath, base);
-  strcat(qpath, ext);
-  return qpath;
-}
-
-const char *DirName(const char *X) {
-  char dir[YAP_FILENAME_MAX];
-  char drive[YAP_FILENAME_MAX];
-  char *o = unix2win(X, NULL, YAP_FILENAME_MAX);
-  int err;
-  if (!o)
-    return NULL;
-  if ((err = _splitpath_s(o, drive, YAP_FILENAME_MAX - 1, dir,
-                          YAP_FILENAME_MAX - 1, NULL, 0, NULL, 0)) != 0) {
-    FileError(SYSTEM_ERROR_OPERATING_SYSTEM, TermNil,
-              "could not perform _splitpath %s: %s", X, strerror(errno));
-    return NULL;
-  }
-  strncpy(o, drive, YAP_FILENAME_MAX - 1);
-  strncat(o, dir, YAP_FILENAME_MAX - 1);
-  return o;
-}
-#endif
 
 static const char *myrealpath(const char *path, char *out) {
   if (!out)
     out = LOCAL_FileNameBuf;
-#if _WIN32 || defined(__MINGW32__)
+#if _WIN32
   DWORD retval = 0;
 
   // notice that the file does not need to exist
   retval = GetFullPathName(path, YAP_FILENAME_MAX, out, NULL);
-
   if (retval == 0) {
     Yap_WinError("Generating a full path name for a file");
     return NULL;
@@ -583,101 +548,80 @@ static const char *expandVars(const char *spec, char *u) {
  * @return tmp, or NULL, in malloced memory
  */
 const char *Yap_AbsoluteFile(const char *spec, char *rc0, bool ok) {
-  const char *p;
   const char *rc;
-  if (!ok) {
-    if (!rc0)
-      rc0 = malloc(strlen(spec)+1);
-    return strcpy(rc0, spec);
-  }
-  rc = PlExpandVars(spec, NULL, rc0);
-  if (!rc)
-    rc = spec;
-  if ((p = myrealpath(rc, rc0))) {
-    if (rc != rc0 && rc != spec && rc != p)
-      freeBuffer(rc);
-    return p;
-  } else {
-    if (rc != rc0 && rc != spec)
-      freeBuffer(rc);
+  const char *spec1;
+  const char *spec2;
+  char rc1[YAP_FILENAME_MAX+1];
+
+  /// spec gothe original spec;
+  /// rc0 may be an outout buffer
+  /// rc1 the internal buffer
+  ///
+  /// PlExpandVars
+  
+
+#if _WIN32
+  char rc2[YAP_FILENAME_MAX];
+  if (( rc = unix2win(spec, rc2, YAP_FILENAME_MAX)) == NULL) {
     return NULL;
   }
-}
-
-/**
- * generate absolute path and stores path in an user given buffer. If
- * NULL, uses a temporary buffer that must be quickly released.
- *
- * if ok first expand variable names and do globbing
- *
- * @param[in]  spec the file path, including `~` and `$`.
- * @param[in]  ok where to process `~` and `$`.
- *
- * @return tmp, or NULL, in malloced memory
- */
-const char *Yap_AbsoluteFileInBuffer(const char *spec, char *out, size_t sz,
-                                     bool ok) {
-  CACHE_REGS
-  const char *p;
-  const char *rc;
+  spec1 = rc;
+#else
+  spec1 = spec;
+#endif
+  /// spec gothe original spec;
+  /// rc1 the internal buffer
   if (ok) {
-    rc = expandVars(spec, LOCAL_FileNameBuf);
-    if (!rc)
-      return spec;
+    const char *q = PlExpandVars(spec1, NULL, rc1);
+    if (!q)
+      spec2 = spec1;
+    else
+      spec2 = q;
   } else {
-    rc = spec;
+    spec2 = spec1;
   }
-
-  if ((p = myrealpath(rc, NULL))) {
-    if (!out) {
-      out = LOCAL_FileNameBuf;
-      sz = YAP_FILENAME_MAX - 1;
-    }
-    if (p != out) {
-      strncpy(out, p, sz);
-      freeBuffer(p);
-      return out;
-    } else {
-      return NULL;
-    }
-  }
-  return NULL;
+  rc = myrealpath(spec2, rc0);
+  return rc;
 }
 
 static Term
-    /* Expand the string for the program to run.  */
-    do_glob(const char *spec, bool glob_vs_wordexp) {
+/* Expand the string for the program to run.  */
+do_glob(const char *spec, bool glob_vs_wordexp) {
   CACHE_REGS
   char u[YAP_FILENAME_MAX + 1];
-  char *espec = u;
+  const char *espec = u;
   if (spec == NULL) {
     return TermNil;
   }
-#if _WIN32 || defined(__MINGW32__)
+#if _WIN32
   {
     WIN32_FIND_DATA find;
     HANDLE hFind;
     CELL *dest;
     Term tf;
+    char drive[_MAX_DRIVE];
+    char dir[_MAX_DIR];
+    char fname[_MAX_FNAME];
+    char ext[_MAX_EXT];
+
+    _splitpath( spec, drive, dir, fname, ext );
+    _makepath( u, drive, dir, fname, ext );
 
     // first pass, remove Unix style stuff
-    if (unix2win(espec, u, YAP_FILENAME_MAX) == NULL)
-      return TermNil;
-    espec = (const char *)u;
-
-    hFind = FindFirstFile(espec, &find);
-
+    hFind = FindFirstFile(u, &find);
     if (hFind == INVALID_HANDLE_VALUE) {
       return TermNil;
     } else {
       tf = AbsPair(HR);
-      HR[0] = MkAtomTerm(Yap_LookupAtom(find.cFileName));
+      _makepath( u, drive, dir, find.cFileName, NULL );
+      HR[0] = MkAtomTerm(Yap_LookupAtom(u));
       HR[1] = TermNil;
       dest = HR + 1;
       HR += 2;
       while (FindNextFile(hFind, &find)) {
         *dest = AbsPair(HR);
-        HR[0] = MkAtomTerm(Yap_LookupAtom(find.cFileName));
+	_makepath( u, drive, dir, find.cFileName, NULL );
+	HR[0] = MkAtomTerm(Yap_LookupAtom(u));
         HR[1] = TermNil;
         dest = HR + 1;
         HR += 2;
@@ -687,7 +631,7 @@ static Term
     return tf;
   }
 #elif HAVE_WORDEXP || HAVE_GLOB
-  strncpy(espec, spec, sizeof(u));
+  strncpy(u, spec, sizeof(u));
   /* Expand the string for the program to run.  */
   size_t pathcount;
 #if HAVE_GLOB
@@ -807,7 +751,8 @@ static Term
  */
 static Int real_path(USES_REGS1) {
   Term t1 = Deref(ARG1);
-  const char *cmd;
+  const char *cmd, *rc0;
+  char *rc;
 
   if (IsAtomTerm(t1)) {
     cmd = RepAtom(AtomOfTerm(t1))->StrOfAE;
@@ -816,14 +761,20 @@ static Int real_path(USES_REGS1) {
   } else {
     return false;
   }
-  const char *rc = myrealpath(cmd, NULL);
-  if (!rc) {
-    PlIOError(SYSTEM_ERROR_OPERATING_SYSTEM, ARG1, strerror(errno));
+#if _WIN32
+  char cmd2[YAP_FILENAME_MAX+1];
+  
+  if (( rc = unix2win(cmd, cmd2, YAP_FILENAME_MAX)) == NULL) {
     return false;
   }
-  bool r = Yap_unify(MkAtomTerm(Yap_LookupAtom(rc)), ARG2);
-  freeBuffer((char *)rc);
-  return r;
+  cmd = rc;
+#endif
+  
+  rc0 = myrealpath(cmd, NULL);
+  if (!rc0) {
+    PlIOError(SYSTEM_ERROR_OPERATING_SYSTEM, ARG1, NULL);
+  }
+  return Yap_unify(MkAtomTerm(Yap_LookupAtom(rc0)), ARG2);
 }
 
 #define EXPAND_FILENAME_DEFS()                                                 \
@@ -864,6 +815,18 @@ static Term do_expand_file_name(Term t1, Term opts USES_REGS) {
     Yap_Error(TYPE_ERROR_ATOM, t1, NULL);
     return TermNil;
   }
+#if _WIN32
+  {
+    char *rc;
+    char cmd2[YAP_FILENAME_MAX+1];
+  
+    if (( rc = unix2win(spec, cmd2, YAP_FILENAME_MAX)) == NULL) {
+      return false;
+    }
+    spec = rc;
+  }
+#endif
+  
   args = Yap_ArgListToVector(opts, expand_filename_defs, EXPAND_FILENAME_END);
   if (args == NULL) {
     return TermNil;
@@ -903,7 +866,10 @@ static Term do_expand_file_name(Term t1, Term opts USES_REGS) {
   }
 
   if (!use_system_expansion) {
-    return MkPairTerm(MkAtomTerm(Yap_LookupAtom(expandVars(spec, NULL))),
+    const char *o = expandVars(spec, NULL);
+    if (!o)
+      return false;
+    return MkPairTerm(MkAtomTerm(Yap_LookupAtom(o)),
                       TermNil);
   }
   tf = do_glob(spec, true);
@@ -1251,6 +1217,7 @@ const char *Yap_getcwd(const char *cwd, size_t cwdlen) {
 static Int working_directory(USES_REGS1) {
   char dir[YAP_FILENAME_MAX + 1];
   Term t1 = Deref(ARG1), t2;
+
   if (!IsVarTerm(t1) && !IsAtomTerm(t1)) {
     Yap_Error(TYPE_ERROR_ATOM, t1, "working_directory");
   }
@@ -1264,8 +1231,9 @@ static Int working_directory(USES_REGS1) {
   if (!IsAtomTerm(t2)) {
     Yap_Error(TYPE_ERROR_ATOM, t2, "working_directory");
   }
-  ChDir(RepAtom(AtomOfTerm(t2))->StrOfAE);
-  return true;
+  if (t2 == TermEmptyAtom || t2 == TermDot)
+    return true;
+  return ChDir(RepAtom(AtomOfTerm(t2))->StrOfAE);
 }
 
 /** Yap_findFile(): tries to locate a file, no expansion should be performed/
@@ -1389,7 +1357,7 @@ const char *Yap_findFile(const char *isource, const char *idef,
 
     // expand names in case you have
     // to add a prefix
-    if (!access || exists(work))
+    if (!access || Yap_Exists(work))
       return work; // done
   }
   return NULL;
@@ -1401,18 +1369,23 @@ const char *Yap_locateFile(const char *source, char *result, bool in_lib) {
 
 static Int true_file_name(USES_REGS1) {
   Term t = Deref(ARG1);
+  const char *s;
 
   if (IsVarTerm(t)) {
     Yap_Error(INSTANTIATION_ERROR, t, "argument to true_file_name unbound");
     return FALSE;
   }
-  if (!IsAtomTerm(t)) {
+  if (IsAtomTerm(t)) {
+    s = RepAtom(AtomOfTerm(t))->StrOfAE;
+  } else if (IsStringTerm(t)) {
+    s = StringOfTerm(t);
+  } else {
     Yap_Error(TYPE_ERROR_ATOM, t, "argument to true_file_name");
     return FALSE;
   }
-  if (!Yap_AbsoluteFileInBuffer(RepAtom(AtomOfTerm(t))->StrOfAE,
-                                LOCAL_FileNameBuf, YAP_FILENAME_MAX - 1, true))
-    return FALSE;
+  if (!Yap_AbsoluteFile(s,
+                                LOCAL_FileNameBuf, true))
+    return true;
   return Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom(LOCAL_FileNameBuf)));
 }