Changeset 1946 for trunk


Ignore:
Timestamp:
May 2, 2005, 4:56:25 AM (21 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:
1 added
5 edited

Legend:

Unmodified
Added
Removed

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

    • Property cvs2svn:cvs-rev changed from 1.20 to 1.21
    r1945 r1946  
    229229 * @returns Negative error code (errno.h) on failure.
    230230 * @param   pszPath     Path to the new current directory of the process.
    231  */
    232 int __libc_Back_fsDirCurrentSet(const char *pszPath);
     231 * @param   fDrive      Force a change of the current drive too.
     232 */
     233int __libc_Back_fsDirCurrentSet(const char *pszPath, int fDrive);
    233234
    234235/**

  • trunk/src/emx/include/stdlib.h

    • Property cvs2svn:cvs-rev changed from 1.31 to 1.32
    r1945 r1946  
    292292#ifdef __BSD_VISIBLE
    293293char    *_getcwdux(char *, size_t);
    294 /** @todo: int     _chdirux(char *); */
    295294char    *_realrealpath(const char *, char *, size_t);
    296295#endif
    … …  
    421420long double _atofl (__const__ char *);
    422421int _chdir2 (__const__ char *);
     422
    423423int _chdrive (int);
    424424int _core (int);

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

    • Property cvs2svn:cvs-rev changed from 1.6 to 1.7
    r1945 r1946  
    22/** @file
    33 *
    4  * chdir.
     4 * chdir.
    55 *
    6  * Copyright (c) 2004 knut st. osmundsen <[email protected]>
     6 * Copyright (c) 2004 knut st. osmundsen <[email protected]>
    77 *
    88 *
    … …  
    3636#include <InnoTekLIBC/logstrict.h>
    3737
     38
    3839/**
    39  * Changes the current directory.
     40 * Changes the current directory and drive.
     41 *
     42 * Use _chdir_os2 for a VAC/MSC compatible chdir.
    4043 *
    4144 * @returns 0 on success.
    … …  
    4649{
    4750    LIBCLOG_ENTER("path=%p:{%s}\n", (void *)path, path);
    48     int rc = __libc_Back_fsDirCurrentSet(path);
     51    int rc = __libc_Back_fsDirCurrentSet(path);
    4952    if (!rc)
    5053        LIBCLOG_RETURN_INT(0);
    … …  
    5255    LIBCLOG_RETURN_INT(-1);
    5356}
     57

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

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r1945 r1946  
    33#include "libc-alias.h"
    44#include <stdlib.h>
    5 #include <string.h>
    6 #include <emx/io.h>
    7 #include <emx/syscalls.h>
    8 #include <InnoTekLIBC/backend.h>
    95
    106int _chdir2 (const char *name)
    117{
    12   char old_drive, new_drive;
    13 
    14   old_drive = _getdrive ();
    15   new_drive = _fngetdrive (name);
    16   if (new_drive != 0)
    17     {
    18       if (_chdrive (new_drive) != 0)
    19         return -1;
    20       if (name[2] == 0)         /* Change drive only */
    21         return 0;
    22     }
    23   int rc = __libc_Back_fsDirCurrentSet (name);
    24   if (rc == 0)
    25     return 0;
    26   else
    27     {
    28       _chdrive (old_drive);
    29       errno = -rc;
    30