branch update for HEAD-2003021201

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

diff --git a/lib/msvcrt/stdlib/splitp.c b/lib/msvcrt/stdlib/splitp.c
index 20536c6..ca163bf 100644 (file)
--- a/lib/msvcrt/stdlib/splitp.c
+++ b/lib/msvcrt/stdlib/splitp.c
@@ -1,91 +1,47 @@
 #include <msvcrt/stdlib.h>
 #include <msvcrt/string.h>
 
-void _splitpath( const char *path, char *drive, char *dir, char *fname, char *ext )
-{
-       char *tmp_drive;
-       char *tmp_dir;
-       char *tmp_ext;
-
-       tmp_drive = (char *)strchr(path,':');
-       if ( tmp_drive != (char *)NULL ) {
-               strncpy(drive,tmp_drive-1,1);
-               *(drive+1) = 0;
-       }
-       else {
-               *drive = 0; 
-               tmp_drive = (char *)path;
-       }
-
-       tmp_dir = (char *)strrchr(path,'\\');
-       if( tmp_dir != NULL && tmp_dir != tmp_drive + 1 ) {
-               strncpy(dir,tmp_drive+1,tmp_dir - tmp_drive);
-               *(dir + (tmp_dir - tmp_drive)) = 0;
-       }
-       else    
-               *dir =0;
-
-       tmp_ext = ( char *)strrchr(path,'.');
-       if ( tmp_ext != NULL ) {
-               strcpy(ext,tmp_ext);
-       }
-       else
-       {
-               *ext = 0; 
-               tmp_ext = (char *)path+strlen(path);
-       }
-    if ( tmp_dir != NULL ) {
-               strncpy(fname,tmp_dir+1,tmp_ext - tmp_dir - 1);
-               *(fname + (tmp_ext - tmp_dir -1)) = 0;
-       }
-       else
-       {
-               strncpy(fname,path,tmp_ext - path);
-               *(fname+(tmp_ext-path))=0;
-       }
-}
 
-void _wsplitpath( const wchar_t *path, wchar_t *drive, wchar_t *dir, wchar_t *fname, wchar_t *ext )
+void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext)
 {
-       wchar_t *tmp_drive;
-       wchar_t *tmp_dir;
-       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;
-       }
-       else {
-               *drive = 0;
-               tmp_drive = (wchar_t *)path;
-       }
-
-       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;
-       }
-       else
-               *dir =0;
-
-       tmp_ext = (wchar_t *)wcsrchr(path,L'.');
-       if ( tmp_ext != NULL ) {
-               wcscpy(ext,tmp_ext);
-       }
-       else
-       {
-               *ext = 0;
-               tmp_ext = (wchar_t *)path+wcslen(path);
-       }
-
-       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);
-               *(fname+(tmp_ext-path))=0;
-       }
+    char* tmp_drive;
+    char* tmp_dir;
+    char* tmp_ext;
+
+    tmp_drive = (char*)strchr(path,':');
+    if ( tmp_drive != (char*)NULL ) {
+        strncpy(drive,tmp_drive-1,1);
+        *(drive+1) = 0;
+    }
+    else {
+        *drive = 0;
+        tmp_drive = (char*)path;
+    }
+
+    tmp_dir = (char*)strrchr(path,'\\');
+    if( tmp_dir != NULL && tmp_dir != tmp_drive + 1 ) {
+        strncpy(dir,tmp_drive+1,tmp_dir - tmp_drive);
+        *(dir + (tmp_dir - tmp_drive)) = 0;
+    }
+    else
+        *dir =0;
+
+    tmp_ext = ( char* )strrchr(path,'.');
+    if ( tmp_ext != NULL ) {
+        strcpy(ext,tmp_ext);
+    }
+    else
+    {
+        *ext = 0;
+        tmp_ext = (char*)path+strlen(path);
+    }
+    if ( tmp_dir != NULL ) {
+        strncpy(fname,tmp_dir+1,tmp_ext - tmp_dir - 1);
+        *(fname + (tmp_ext - tmp_dir -1)) = 0;
+    }
+    else
+    {
+        strncpy(fname,path,tmp_ext - path);
+        *(fname+(tmp_ext-path))=0;
+    }
 }