reparse.c: Include <stdlib.h> for alloca

[wimlib] / src / reparse.c

diff --git a/src/reparse.c b/src/reparse.c
index a245a7e16a455e0575d8caffab6ae002d20f3503..c00c7c1c16906a6d95acc71ff9c989cc9f13e9ba 100644 (file)
--- a/src/reparse.c
+++ b/src/reparse.c
@@ -28,6 +28,10 @@
 #include "lookup_table.h"
 #include "sha1.h"
 #include <errno.h>
+#include <stdlib.h>
+#ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+#endif
 
 static const utf16lechar volume_junction_prefix[11] = {
        cpu_to_le16('\\'),
@@ -225,7 +229,7 @@ wim_inode_get_reparse_data(const struct wim_inode *inode, u8 *rpbuf)
        }
 
        /* Read the data from the WIM file */
-       ret = read_full_resource_into_buf(lte, rpbuf + 8, true);
+       ret = read_full_resource_into_buf(lte, rpbuf + 8);
        if (ret)
                return ret;
 
@@ -315,10 +319,6 @@ out_have_link:
        return ret;
 }
 
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#endif
-
 int
 wim_inode_set_symlink(struct wim_inode *inode,
                      const char *target,
@@ -465,6 +465,12 @@ capture_fixup_absolute_symlink(tchar *dest,
 {
        tchar *p = dest;
 
+#ifdef __WIN32__
+       /* Skip drive letter */
+       if (!is_rp_path_separator(*dest))
+               p += 2;
+#endif
+
        DEBUG("Fixing symlink or junction \"%"TS"\"", dest);
        for (;;) {
                tchar save;
@@ -491,6 +497,13 @@ capture_fixup_absolute_symlink(tchar *dest,
                                *(p - 1) = RP_PATH_SEPARATOR;
                        while (p - 1 >= dest && is_rp_path_separator(*(p - 1)))
                                p--;
+               #ifdef __WIN32__
+                       if (!is_rp_path_separator(dest[0])) {
+                               *--p = dest[1];
+                               *--p = dest[0];
+                       }
+               #endif
+                       wimlib_assert(p >= dest);
                        return p;
                }