Changeset 1946

Timestamp:

May 2, 2005, 4:56:25 AM (20 years ago)

Author:

bird

Message:

Changed chdir() to unix style, added _chdir_os2() as a backwards compatible api. _chdir2() and chdir() are operating identically now.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/stdlib.h (modified) (2 diffs, 1 prop)
• src/lib/misc/_chdir_os2.c (added)
• src/lib/misc/chdir.c (modified) (4 diffs, 1 prop)
• src/lib/misc/chdir2.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsDirCurrentSet.c (modified) (4 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -229 +229 @@
  * @returns Negative error code (errno.h) on failure.
  * @param   pszPath     Path to the new current directory of the process.
- */
-int __libc_Back_fsDirCurrentSet(const char *pszPath);
+ * @param   fDrive      Force a change of the current drive too.
+ */
+int __libc_Back_fsDirCurrentSet(const char *pszPath, int fDrive);
 
 /**

trunk/src/emx/include/stdlib.h

@@ -292 +292 @@
 #ifdef __BSD_VISIBLE
 char    *_getcwdux(char *, size_t);
-/** @todo: int     _chdirux(char *); */
 char    *_realrealpath(const char *, char *, size_t);
 #endif
@@ -421 +420 @@
 long double _atofl (__const__ char *);
 int _chdir2 (__const__ char *);
+int _chdir_os2 (const char *);
 int _chdrive (int);
 int _core (int);

trunk/src/emx/src/lib/misc/chdir.c

@@ -2 +2 @@
 /** @file
  *
- * chdir.
+ * LIBC - chdir.
  *
- * Copyright (c) 2004 knut st. osmundsen <bird@innotek.de>
+ * Copyright (c) 2004-2005 knut st. osmundsen <bird@innotek.de>
  *
  *
@@ -36 +36 @@
 #include <InnoTekLIBC/logstrict.h>
 
+
 /**
- * Changes the current directory.
+ * Changes the current directory and drive.
+ *
+ * Use _chdir_os2 for a VAC/MSC compatible chdir.
  *
  * @returns 0 on success.
@@ -46 +49 @@
 {
     LIBCLOG_ENTER("path=%p:{%s}\n", (void *)path, path);
-    int rc = __libc_Back_fsDirCurrentSet(path);
+    int rc = __libc_Back_fsDirCurrentSet(path, 1);
     if (!rc)
         LIBCLOG_RETURN_INT(0);
@@ -52 +55 @@
     LIBCLOG_RETURN_INT(-1);
 }
+

trunk/src/emx/src/lib/misc/chdir2.c

@@ -3 +3 @@
 #include "libc-alias.h"
 #include <stdlib.h>
-#include <string.h>
-#include <emx/io.h>
-#include <emx/syscalls.h>
-#include <InnoTekLIBC/backend.h>
 
 int _chdir2 (const char *name)
 {
-  char old_drive, new_drive;
-
-  old_drive = _getdrive ();
-  new_drive = _fngetdrive (name);
-  if (new_drive != 0)
-    {
-      if (_chdrive (new_drive) != 0)
-        return -1;
-      if (name[2] == 0)         /* Change drive only */
-        return 0;
-    }
-  int rc = __libc_Back_fsDirCurrentSet (name);
-  if (rc == 0)
-    return 0;
-  else
-    {
-      _chdrive (old_drive);
-      errno = -rc;
-      return -1;
-    }
+    return chdir(name);
 }

trunk/src/emx/src/lib/sys/b_fsDirCurrentSet.c

@@ -44 +44 @@
  * @returns Negative error code (errno.h) on failure.
  * @param   pszPath     Path to the new current directory of the process.
+ * @param   fDrive      Force a change of the current drive too.
  */
-int __libc_Back_fsDirCurrentSet(const char *pszPath)
+int __libc_Back_fsDirCurrentSet(const char *pszPath, int fDrive)
 {
-    LIBCLOG_ENTER("pszPath=%p:{%s}\n", (void *)pszPath, pszPath);
+    LIBCLOG_ENTER("pszPath=%p:{%s} fDrive=%d\n", (void *)pszPath, pszPath, fDrive);
     FS_VAR();
 
@@ -69 +70 @@
          *
          * If we change into or out of the unix root, we must make sure the
-         * default disk is changed too. This means that we keep the OS/2
-         * semantics of chdir() when not in the unix comparement, with the
-         * obvious exception of root relative paths.
+         * default disk is changed too. We'll only do unix chdir behaviour
+         * when in the unix compartement or when fDrive is set.
          */
         FS_SAVE_LOAD();
@@ -78 +78 @@
         if (!rc)
         {
-            if (__libc_gcchUnixRoot)
+            if (fDrive || __libc_gcchUnixRoot)
             {
-                if (fInUnixTree != __libc_gfInUnixTree)
+                if (fDrive || fInUnixTree != __libc_gfInUnixTree)
                 {
                     ULONG ulDrive = szNativePath[0] - (szNativePath[0] >= 'A' && szNativePath[0] <= 'Z' ? 'A' - 1 : 'a' -1);
@@ -86 +86 @@
                     LIBC_ASSERTM(!rc, "DosSetDefaultDisk(%ld) -> %d. unix drive is %c\n", ulDrive, rc, szNativePath[0]);
                     rc = 0;             /* ignore this kind of errors. */
+                    __libc_gfInUnixTree = fInUnixTree;
                 }
-                __libc_gfInUnixTree = fInUnixTree;
             }
         }