Fix splitpath and wsplitpath for the file extension.

2c39191e · Dave Belanger · Alexandre Julliard · ad24c559 · 2c39191e · 2c39191e
Commit 2c39191e authored Oct 21, 2003 by Dave Belanger Committed by Alexandre Julliard Oct 21, 2003
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

dir.c dlls/msvcrt/dir.c +5 -2

string.c dlls/ntdll/string.c +5 -2

No files found.
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -463,8 +463,11 @@ void _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar
    }
    else if (dir) dir[0] = 0;

-    /* look for extension */
-    for (end = inpath; *end; end++) if (*end == '.') break;
+    /* look for extension: what's after the last dot */
+    end = NULL;
+    for (p = inpath; *p; p++) if (*p == '.') end = p;
+
+    if (!end) end = p; /* there's no extension */

    if (fname)
    {

--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -376,8 +376,11 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir,
    }
    else if (dir) dir[0] = 0;

-    /* look for extension */
-    for (end = inpath; *end; end++) if (*end == '.') break;
+    /* look for extension: what's after the last dot */
+    end = NULL;
+    for (p = inpath; *p; p++) if (*p == '.') end = p;
+
+    if (!end) end = p; /* there's no extension */

    if (fname)
    {