ntfs-3g_apply.c: handle ntfs_attr_pwrite() short writes

[wimlib] / src / ntfs-3g_apply.c

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 148abc769f058373ad5f350cfad773ae0c269bc7..d0f3bb6cc86b0b850e43e7547cf5e2fb936824ed 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -517,7 +517,11 @@ ntfs_3g_create_directories(struct wim_dentry *root,
 
        root->d_inode->i_mft_no = FILE_root;
 
-       ret = ntfs_3g_create_dirs_recursive(root_ni, root, ctx);
+       ret = ntfs_3g_set_metadata(root_ni, root->d_inode, ctx);
+       if (!ret)
+               ret = ntfs_3g_create_empty_attributes(root_ni, root->d_inode, ctx);
+       if (!ret)
+               ret = ntfs_3g_create_dirs_recursive(root_ni, root, ctx);
 
        if (ntfs_inode_close(root_ni) && !ret) {
                ERROR_WITH_ERRNO("Error closing root of NTFS volume");
@@ -851,16 +855,35 @@ out:
        return ret;
 }
 
+/* Note: contrary to its documentation, ntfs_attr_pwrite() can return a short
+ * count in non-error cases --- specifically, when writing to a compressed
+ * attribute and the requested count exceeds the size of an NTFS "compression
+ * block".  Therefore, we must continue calling ntfs_attr_pwrite() until all
+ * bytes have been written or a real error has occurred.  */
+static bool
+ntfs_3g_full_pwrite(ntfs_attr *na, u64 offset, size_t size, const u8 *data)
+{
+       while (size) {
+               s64 res = ntfs_attr_pwrite(na, offset, size, data);
+               if (unlikely(res <= 0))
+                       return false;
+               wimlib_assert(res <= size);
+               offset += res;
+               size -= res;
+               data += res;
+       }
+       return true;
+}
+
 static int
 ntfs_3g_extract_chunk(const void *chunk, size_t size, void *_ctx)
 {
        struct ntfs_3g_apply_ctx *ctx = _ctx;
-       s64 res;
 
        for (unsigned i = 0; i < ctx->num_open_attrs; i++) {
-               res = ntfs_attr_pwrite(ctx->open_attrs[i],
-                                      ctx->offset, size, chunk);
-               if (res != size) {
+               if (!ntfs_3g_full_pwrite(ctx->open_attrs[i],
+                                        ctx->offset, size, chunk))
+               {
                        ERROR_WITH_ERRNO("Error writing data to NTFS volume");
                        return WIMLIB_ERR_NTFS_3G;
                }