Add support for capturing/applying object IDs

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

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index fe1fbf55a37989f1a0de5a708229e1f46c266669..93d71e55bcefd951b84c5d57a271cd03285badff 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -31,6 +31,7 @@
 #include <errno.h>
 
 #include <ntfs-3g/attrib.h>
+#include <ntfs-3g/object_id.h>
 #include <ntfs-3g/reparse.h>
 #include <ntfs-3g/security.h>
 #include <ntfs-3g/volume.h>
@@ -44,6 +45,7 @@
 #include "wimlib/endianness.h"
 #include "wimlib/error.h"
 #include "wimlib/ntfs_3g.h"
+#include "wimlib/object_id.h"
 #include "wimlib/paths.h"
 #include "wimlib/reparse.h"
 #include "wimlib/security.h"
@@ -70,7 +72,7 @@ struct ntfs_location {
        u64 mft_no;
        ATTR_TYPES attr_type;
        u32 attr_name_nchars;
-       utf16lechar *attr_name;
+       ntfschar *attr_name;
        u64 sort_key;
 };
 
@@ -167,7 +169,8 @@ void
 free_ntfs_location(struct ntfs_location *loc)
 {
        put_ntfs_volume(loc->volume);
-       FREE(loc->attr_name);
+       if (loc->attr_name != AT_UNNAMED)
+               FREE(loc->attr_name);
        FREE(loc);
 }
 
@@ -177,7 +180,7 @@ clone_ntfs_location(const struct ntfs_location *loc)
        struct ntfs_location *new = memdup(loc, sizeof(*loc));
        if (!new)
                goto err0;
-       if (loc->attr_name) {
+       if (loc->attr_name != AT_UNNAMED) {
                new->attr_name = utf16le_dup(loc->attr_name);
                if (!new->attr_name)
                        goto err1;
@@ -316,7 +319,7 @@ scan_ntfs_attr(struct wim_inode *inode,
        u64 data_size = ntfs_get_attribute_value_length(record);
        const u32 name_nchars = record->name_length;
        struct blob_descriptor *blob = NULL;
-       utf16lechar *stream_name = NULL;
+       utf16lechar *stream_name = (utf16lechar *)NO_STREAM_NAME;
        int ret;
 
        if (unlikely(name_nchars)) {
@@ -354,7 +357,7 @@ scan_ntfs_attr(struct wim_inode *inode,
                        goto out_cleanup;
                }
 
-               blob->ntfs_loc = CALLOC(1, sizeof(struct ntfs_location));
+               blob->ntfs_loc = MALLOC(sizeof(struct ntfs_location));
                if (unlikely(!blob->ntfs_loc)) {
                        ret = WIMLIB_ERR_NOMEM;
                        goto out_cleanup;
@@ -363,16 +366,19 @@ scan_ntfs_attr(struct wim_inode *inode,
                blob->blob_location = BLOB_IN_NTFS_VOLUME;
                blob->size = data_size;
                blob->ntfs_loc->volume = get_ntfs_volume(volume);
-               blob->ntfs_loc->attr_type = type;
                blob->ntfs_loc->mft_no = ni->mft_no;
+               blob->ntfs_loc->attr_type = type;
 
                if (unlikely(name_nchars)) {
+                       blob->ntfs_loc->attr_name_nchars = name_nchars;
                        blob->ntfs_loc->attr_name = utf16le_dup(stream_name);
                        if (!blob->ntfs_loc->attr_name) {
                                ret = WIMLIB_ERR_NOMEM;
                                goto out_cleanup;
                        }
-                       blob->ntfs_loc->attr_name_nchars = name_nchars;
+               } else {
+                       blob->ntfs_loc->attr_name_nchars = 0;
+                       blob->ntfs_loc->attr_name = AT_UNNAMED;
                }
 
                ret = set_attr_sort_key(ni, blob->ntfs_loc);
@@ -381,11 +387,11 @@ scan_ntfs_attr(struct wim_inode *inode,
        }
 
        ret = add_stream(inode, path, attr_type_to_wimlib_stream_type(type),
-                        stream_name ? stream_name : NO_STREAM_NAME,
-                        &blob, unhashed_blobs);
+                        stream_name, &blob, unhashed_blobs);
 out_cleanup:
        free_blob_descriptor(blob);
-       FREE(stream_name);
+       if (stream_name != NO_STREAM_NAME)
+               FREE(stream_name);
        return ret;
 }
 
@@ -432,6 +438,22 @@ out_put_actx:
        return ret;
 }
 
+static noinline_for_stack int
+load_object_id(ntfs_inode *ni, struct wim_inode *inode)
+{
+       OBJECT_ID_ATTR attr;
+       int len;
+
+       len = ntfs_get_ntfs_object_id(ni, (char *)&attr, sizeof(attr));
+       if (likely(len == -ENODATA || len == 0))
+               return 0;
+       if (len < 0)
+               return WIMLIB_ERR_NTFS_3G;
+       if (!inode_set_object_id(inode, &attr, len))
+               return WIMLIB_ERR_NOMEM;
+       return 0;
+}
+
 /* Load the security descriptor of an NTFS inode into the corresponding WIM
  * inode and the WIM image's security descriptor set.  */
 static noinline_for_stack int
@@ -772,6 +794,13 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                        goto out;
        }
 
+       /* Load the object ID.  */
+       ret = load_object_id(ni, inode);
+       if (ret) {
+               ERROR_WITH_ERRNO("Error reading object ID of \"%s\"", path);
+               goto out;
+       }
+
        /* Scan the data streams.
         *
         * Note: directories should not have an unnamed data stream, but they