update for HEAD-2003091401

[reactos.git] / lib / msvcrt / stdlib / wsplitp.c

diff --git a/lib/msvcrt/stdlib/wsplitp.c b/lib/msvcrt/stdlib/wsplitp.c
index 7d20667..07f72d0 100644 (file)
--- a/lib/msvcrt/stdlib/wsplitp.c
+++ b/lib/msvcrt/stdlib/wsplitp.c
@@ -2,6 +2,9 @@
 #include <msvcrt/string.h>
 
 
+/*
+ * @implemented
+ */
 void _wsplitpath(const wchar_t* path, wchar_t* drive, wchar_t* dir, wchar_t* fname, wchar_t* ext)
 {
     wchar_t* tmp_drive;
@@ -9,40 +12,40 @@ void _wsplitpath(const wchar_t* path, wchar_t* drive, wchar_t* dir, wchar_t* fna
     wchar_t* tmp_ext;
 
     tmp_drive = (wchar_t*)wcschr(path,L':');
-    if ( tmp_drive != (wchar_t*)NULL ) {
-        wcsncpy(drive,tmp_drive-1,1);
-        *(drive+1) = 0;
+    if (drive) {
+       if (tmp_drive) {
+           wcsncpy(drive,tmp_drive-1,2);
+           *(drive+2) = 0;
+       } else {
+           *drive = 0;
+       }
     }
-    else {
-        *drive = 0;
-        tmp_drive = (wchar_t*)path;
+    if (!tmp_drive) {
+       tmp_drive = (wchar_t*)path - 1;
     }
 
     tmp_dir = (wchar_t*)wcsrchr(path,L'\\');
-    if( tmp_dir != NULL && tmp_dir != tmp_drive + 1 ) {
-        wcsncpy(dir,tmp_drive+1,tmp_dir - tmp_drive);
-        *(dir + (tmp_dir - tmp_drive)) = 0;
+    if (dir) {
+       if (tmp_dir) {
+           wcsncpy(dir,tmp_drive+1,tmp_dir-tmp_drive);
+            *(dir+(tmp_dir-tmp_drive)) = 0;
+       } else
+           *dir =0;
     }
-    else
-        *dir =0;
 
     tmp_ext = (wchar_t*)wcsrchr(path,L'.');
-    if ( tmp_ext != NULL ) {
-        wcscpy(ext,tmp_ext);
+    if (!tmp_ext) {
+       tmp_ext = (wchar_t*)path+wcslen(path);
     }
-    else
-    {
-        *ext = 0;
-        tmp_ext = (wchar_t*)path+wcslen(path);
+    if (ext) {
+        wcscpy(ext,tmp_ext);
     }
 
-    if ( tmp_dir != NULL ) {
-        wcsncpy(fname,tmp_dir+1,tmp_ext - tmp_dir - 1);
-        *(fname + (tmp_ext - tmp_dir -1)) = 0;
-    }
-    else
-    {
-        wcsncpy(fname,path,tmp_ext - path);
+    if (tmp_dir) {
+        wcsncpy(fname,tmp_dir+1,tmp_ext-tmp_dir-1);
+        *(fname+(tmp_ext-tmp_dir-1)) = 0;
+    } else {
+        wcsncpy(fname,tmp_drive+1,tmp_ext-tmp_drive-1);
         *(fname+(tmp_ext-path))=0;
     }
 }