win32_capture.c: Don't add duplicate backslashes

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 30dc3ef51f7a836cf9a6b05c09ba491821496fae..7a836a5bc663be85b886dbc66b6709257299fe09 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -406,11 +406,18 @@ winnt_recurse_directory(HANDLE h,
                                                           info->FileName[1] == L'.'))
                        {
                                wchar_t *p;
                                                           info->FileName[1] == L'.'))
                        {
                                wchar_t *p;

+                               wchar_t *filename;

                                struct wim_dentry *child;
 
                                p = full_path + full_path_nchars;
                                struct wim_dentry *child;
 
                                p = full_path + full_path_nchars;

-                               *p++ = L'\\';
-                               p = wmempcpy(p, info->FileName,
+                               /* Only add a backslash if we don't already have
+                                * one.  This prevents a duplicate backslash
+                                * from being added when the path to the capture
+                                * dir had a trailing backslash.  */
+                               if (*(p - 1) != L'\\')
+                                       *p++ = L'\\';
+                               filename = p;
+                               p = wmempcpy(filename, info->FileName,

                                             info->FileNameLength / 2);
                                *p = '\0';
 
                                             info->FileNameLength / 2);
                                *p = '\0';
 


@@ -419,7 +426,7 @@ winnt_recurse_directory(HANDLE h,
                                                        h,
                                                        full_path,
                                                        p - full_path,
                                                        h,
                                                        full_path,
                                                        p - full_path,

-                                                       full_path + full_path_nchars + 1,
+                                                       filename,

                                                        info->FileNameLength / 2,
                                                        params,
                                                        stats,
                                                        info->FileNameLength / 2,
                                                        params,
                                                        stats,