Sync WinFile to Wine 1.1.30

[reactos.git] / rosapps / applications / winfile / splitpath.c

diff --git a/rosapps/applications/winfile/splitpath.c b/rosapps/applications/winfile/splitpath.c
index 42286ec..7425147 100644 (file)
--- a/rosapps/applications/winfile/splitpath.c
+++ b/rosapps/applications/winfile/splitpath.c
@@ -19,9 +19,6 @@
 #include "winefile.h"
 
 
-#ifdef __WINE__
-#ifdef UNICODE
-
 void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext)
 {
         const WCHAR* end; /* end of processed string */
@@ -75,81 +72,23 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR*
        }
 }
 
-#else /* UNICODE */
-
-void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext)
-{
-        const CHAR* end; /* end of processed string */
-       const CHAR* p;   /* search pointer */
-       const CHAR* s;   /* copy pointer */
-
-       /* extract drive name */
-       if (path[0] && path[1]==':') {
-               if (drv) {
-                       *drv++ = *path++;
-                       *drv++ = *path++;
-                       *drv = '\0';
-               }
-       } else if (drv)
-               *drv = '\0';
-
-       /* search for end of string or stream separator */
-       for(end=path; *end && *end!=':'; )
-               end++;
-
-       /* search for begin of file extension */
-       for(p=end; p>path && *--p!='\\' && *p!='/'; )
-               if (*p == '.') {
-                       end = p;
-                       break;
-               }
-
-       if (ext)
-               for(s=end; (*ext=*s++); )
-                       ext++;
-
-       /* search for end of directory name */
-       for(p=end; p>path; )
-               if (*--p=='\\' || *p=='/') {
-                       p++;
-                       break;
-               }
-
-       if (name) {
-               for(s=p; s<end; )
-                       *name++ = *s++;
-
-               *name = '\0';
-       }
-
-       if (dir) {
-               for(s=path; s<p; )
-                       *dir++ = *s++;
-
-               *dir = '\0';
-       }
-}
-
-#endif /* UNICODE */
-#endif /* __WINE__ */
-
 
 /*
 void main()    // test splipath()
 {
-       TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
-
-       _tsplitpath(L"x\\y", drv, dir, name, ext);
-       _tsplitpath(L"x\\", drv, dir, name, ext);
-       _tsplitpath(L"\\x", drv, dir, name, ext);
-       _tsplitpath(L"x", drv, dir, name, ext);
-       _tsplitpath(L"", drv, dir, name, ext);
-       _tsplitpath(L".x", drv, dir, name, ext);
-       _tsplitpath(L":x", drv, dir, name, ext);
-       _tsplitpath(L"a:x", drv, dir, name, ext);
-       _tsplitpath(L"a.b:x", drv, dir, name, ext);
-       _tsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext);
-       _tsplitpath(L"abc.EFGH:12345", drv, dir, name, ext);
-       _tsplitpath(L"C:/dos/command.com", drv, dir, name, ext);
+       WCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
+
+       _wsplitpath(L"x\\y", drv, dir, name, ext);
+       _wsplitpath(L"x\\", drv, dir, name, ext);
+       _wsplitpath(L"\\x", drv, dir, name, ext);
+       _wsplitpath(L"x", drv, dir, name, ext);
+       _wsplitpath(L"", drv, dir, name, ext);
+       _wsplitpath(L".x", drv, dir, name, ext);
+       _wsplitpath(L":x", drv, dir, name, ext);
+       _wsplitpath(L"a:x", drv, dir, name, ext);
+       _wsplitpath(L"a.b:x", drv, dir, name, ext);
+       _wsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext);
+       _wsplitpath(L"abc.EFGH:12345", drv, dir, name, ext);
+       _wsplitpath(L"C:/dos/command.com", drv, dir, name, ext);
 }
 */