sizeof(struct ntfs_location));
if (new->ntfs_loc == NULL)
goto out_free;
- new->ntfs_loc->path = STRDUP(old->ntfs_loc->path);
- new->ntfs_loc->attr_name = NULL;
- if (new->ntfs_loc->path == NULL)
- goto out_free;
- if (new->ntfs_loc->attr_name_nchars != 0) {
+ if (new->ntfs_loc->attr_name != NULL) {
new->ntfs_loc->attr_name =
- utf16le_dup(old->ntfs_loc->attr_name);
+ utf16le_dup(new->ntfs_loc->attr_name);
if (new->ntfs_loc->attr_name == NULL)
goto out_free;
}
}
break;
#endif
- default:
- break;
}
return new;
#ifdef WITH_NTFS_3G
case BLOB_IN_NTFS_VOLUME:
if (blob->ntfs_loc) {
- FREE(blob->ntfs_loc->path);
FREE(blob->ntfs_loc->attr_name);
FREE(blob->ntfs_loc);
}
return tstrcmp(blob1->file_on_disk, blob2->file_on_disk);
#ifdef WITH_NTFS_3G
case BLOB_IN_NTFS_VOLUME:
- return tstrcmp(blob1->ntfs_loc->path, blob2->ntfs_loc->path);
+ return cmp_u64(blob1->ntfs_loc->mft_no, blob2->ntfs_loc->mft_no);
#endif
default:
/* No additional sorting order defined for this resource
wentry->is_spanned = (res_flags & WIM_RESHDR_FLAG_SPANNED) != 0;
wentry->packed = (res_flags & WIM_RESHDR_FLAG_SOLID) != 0;
}
- copy_hash(wentry->sha1_hash, blob->hash);
+ if (!blob->unhashed)
+ copy_hash(wentry->sha1_hash, blob->hash);
wentry->reference_count = blob->refcnt;
wentry->is_metadata = blob->is_metadata;
}
if (wim_has_metadata(wim)) {
int ret;
for (int i = 0; i < wim->hdr.image_count; i++) {
- ret = do_iterate_blob(wim->image_metadata[i]->metadata_blob,
- &ctx);
+ struct blob_descriptor *blob;
+ struct wim_image_metadata *imd = wim->image_metadata[i];
+
+ ret = do_iterate_blob(imd->metadata_blob, &ctx);
if (ret)
return ret;
+ image_for_each_unhashed_blob(blob, imd) {
+ ret = do_iterate_blob(blob, &ctx);
+ if (ret)
+ return ret;
+ }
}
}
return for_blob_in_table(wim->blob_table, do_iterate_blob, &ctx);