unix_apply.c: Use O_NOFOLLOW when opening files

[wimlib] / src / unix_apply.c

diff --git a/src/unix_apply.c b/src/unix_apply.c
index 152361b01432c01bf5f7fe5865182540bf7e6a5b..8d549f60005d6f5cc2e62cf080f97ed5dcbd2cf7 100644 (file)
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -29,9 +29,9 @@
 
 #include "wimlib/apply.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/resource.h"
 #include "wimlib/timestamp.h"
+#include "wimlib/unix_data.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -44,6 +44,10 @@
 #  include <utime.h>
 #endif
 
+#ifndef O_NOFOLLOW
+#  define O_NOFOLLOW 0
+#endif
+
 static int
 unix_start_extract(const char *target, struct apply_ctx *ctx)
 {
@@ -56,7 +60,7 @@ unix_start_extract(const char *target, struct apply_ctx *ctx)
 static int
 unix_create_file(const char *path, struct apply_ctx *ctx, u64 *cookie_ret)
 {
-       int fd = open(path, O_TRUNC | O_CREAT | O_WRONLY, 0644);
+       int fd = open(path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644);
        if (fd < 0)
                return WIMLIB_ERR_OPEN;
        close(fd);
@@ -118,11 +122,11 @@ unix_extract_unnamed_stream(file_spec_t file,
        int raw_fd;
        int ret;
 
-       raw_fd = open(path, O_WRONLY | O_TRUNC);
+       raw_fd = open(path, O_WRONLY | O_TRUNC | O_NOFOLLOW);
        if (raw_fd < 0)
                return WIMLIB_ERR_OPEN;
        filedes_init(&fd, raw_fd);
-       ret = extract_stream_to_fd(lte, &fd, lte->size);
+       ret = extract_full_stream_to_fd(lte, &fd);
        if (filedes_close(&fd) && !ret)
                ret = WIMLIB_ERR_WRITE;
        return ret;