Changeset 10005 for trunk/src/msvcrt/dir.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/dir.c (modified) (21 diffs)

trunk/src/msvcrt/dir.c

@@ -23 +23 @@
 #ifdef __WIN32OS2__
 #include <emxheader.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 #include <winbase.h>
 #else
@@ -90 +93 @@
  *              _chdir (MSVCRT.@)
  */
-int _chdir(const char * newdir)
+int MSVCRT__chdir(const char * newdir)
 {
   if (!SetCurrentDirectoryA(newdir))
@@ -116 +119 @@
  *              _chdrive (MSVCRT.@)
  */
-int _chdrive(int newdrive)
+int MSVCRT__chdrive(int newdrive)
 {
   char buffer[3] = "A:";
@@ -219 +222 @@
  *              _getcwd (MSVCRT.@)
  */
-char* _getcwd(char * buf, int size)
+char* MSVCRT__getcwd(char * buf, int size)
 {
   char dir[MAX_PATH];
@@ -230 +233 @@
   {
     if (size < 0)
-      return _strdup(dir);
+      return MSVCRT__strdup(dir);
     return msvcrt_strndup(dir,size);
   }
@@ -271 +274 @@
  *              _getdrive (MSVCRT.@)
  */
-int _getdrive(void)
+int MSVCRT__getdrive(void)
 {
     char buffer[MAX_PATH];
@@ -282 +285 @@
  *              _getdcwd (MSVCRT.@)
  */
-char* _getdcwd(int drive, char * buf, int size)
+char* MSVCRT__getdcwd(int drive, char * buf, int size)
 {
   static char* dummy;
@@ -288 +291 @@
   TRACE(":drive %d(%c), size %d\n",drive, drive + 'A' - 1, size);
 
-  if (!drive || drive == _getdrive())
-    return _getcwd(buf,size); /* current */
+  if (!drive || drive == MSVCRT__getdrive())
+    return MSVCRT__getcwd(buf,size); /* current */
   else
   {
@@ -312 +315 @@
     TRACE(":returning '%s'\n", dir);
     if (!buf)
-      return _strdup(dir); /* allocate */
+      return MSVCRT__strdup(dir); /* allocate */
 
     strcpy(buf,dir);
@@ -328 +331 @@
   TRACE(":drive %d(%c), size %d\n",drive, drive + 'A' - 1, size);
 
-  if (!drive || drive == _getdrive())
+  if (!drive || drive == MSVCRT__getdrive())
     return _wgetcwd(buf,size); /* current */
   else
@@ -388 +391 @@
  *              _mkdir (MSVCRT.@)
  */
-int _mkdir(const char * newdir)
+int MSVCRT__mkdir(const char * newdir)
 {
   if (CreateDirectoryA(newdir,NULL))
@@ -410 +413 @@
  *              _rmdir (MSVCRT.@)
  */
-int _rmdir(const char * dir)
+int MSVCRT__rmdir(const char * dir)
 {
   if (RemoveDirectoryA(dir))
@@ -439 +442 @@
   MSVCRT_wchar_t pathbuff[MAX_PATH],*path=pathbuff;
 
-  TRACE(":splitting path %s\n",debugstr_w(path));
+  TRACE("MSVCRT: _wsplitpath %s\n",debugstr_w(path));
   /* FIXME: Should be an strncpyW or something */
   strcpyW(pathbuff, inpath);
@@ -586 +589 @@
       if (q > r)
       {
-        strcpy(q, p + 3);
+        strcpy(q, p + 3);
         s = q;
       }
@@ -622 +625 @@
  *              _fullpath (MSVCRT.@)
  */
-char *_fullpath(char * absPath, const char* relPath, unsigned int size)
+char *MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int size)
 {
   char drive[5],dir[MAX_PATH],file[MAX_PATH],ext[MAX_PATH];
@@ -631 +634 @@
 
   if (!relPath || !*relPath)
-    return _getcwd(absPath, size);
+    return MSVCRT__getcwd(absPath, size);
 
   if (size < 4)
@@ -639 +642 @@
   }
 
-  TRACE(":resolving relative path '%s'\n",relPath);
+  TRACE("MSVCRT: _fullpath '%s'\n",relPath);
 
   _splitpath(relPath, drive, dir, file, ext);
@@ -670 +673 @@
 
   if (!absPath)
-    return _strdup(res);
+    return MSVCRT__strdup(res);
   strcpy(absPath,res);
   return absPath;
@@ -678 +681 @@
  *              _makepath (MSVCRT.@)
  */
-VOID _makepath(char * path, const char * drive,
+VOID MSVCRT__makepath(char * path, const char * drive,
                               const char *directory, const char * filename,
                               const char * extension )
@@ -767 +770 @@
  *              _searchenv (MSVCRT.@)
  */
-void _searchenv(const char* file, const char* env, char *buf)
+void MSVCRT__searchenv(const char* file, const char* env, char *buf)
 {
   char*envVal, *penv;
@@ -824 +827 @@
   } while(1);
 }
+
+MSVCRT_wchar_t* _wfullpath(MSVCRT_wchar_t* absPath,const MSVCRT_wchar_t* relPath,MSVCRT(size_t) size)
+{
+   MSVCRT_wchar_t ch;
+   char asciiabsPath[280], asciirelPath[280];
+
+   TRACE("MSVCRT: _wfullpath %s %d\n", debugstr_w(relPath),size);
+
+   WideCharToMultiByte(CP_ACP, 0, relPath, -1, (LPSTR)asciirelPath, 280, NULL, NULL);
+   
+   MSVCRT__fullpath(asciiabsPath, asciirelPath, size);
+   
+   MultiByteToWideChar(CP_ACP, 0, asciiabsPath, -1, absPath, size);
+
+   return absPath;  
+}