*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
memcpy(new, old, sizeof(*old));
new->extracted_file = NULL;
switch (new->resource_location) {
+#ifdef __WIN32__
+ case RESOURCE_WIN32:
+ {
+ size_t nbytes = utf16le_strlen(old->win32_file_on_disk);
+ new->win32_file_on_disk = MALLOC(nbytes + 2);
+ if (!new->win32_file_on_disk)
+ goto out_free;
+ memcpy(new->win32_file_on_disk, old->win32_file_on_disk,
+ nbytes + 2);
+ }
+ break;
+#endif
case RESOURCE_IN_STAGING_FILE:
case RESOURCE_IN_FILE_ON_DISK:
BUILD_BUG_ON((void*)&old->file_on_disk !=
if (!loc)
goto out_free;
memcpy(loc, old->ntfs_loc, sizeof(*loc));
- loc->path_utf8 = NULL;
- loc->stream_name_utf16 = NULL;
+ loc->path = NULL;
+ loc->stream_name = NULL;
new->ntfs_loc = loc;
- loc->path_utf8 = STRDUP(old->ntfs_loc->path_utf8);
- if (!loc->path_utf8)
+ loc->path = STRDUP(old->ntfs_loc->path);
+ if (!loc->path)
goto out_free;
- loc->stream_name_utf16 = MALLOC(loc->stream_name_utf16_num_chars * 2);
- if (!loc->stream_name_utf16)
+ loc->stream_name = MALLOC((loc->stream_name_nchars + 1) * 2);
+ if (!loc->stream_name)
goto out_free;
- memcpy(loc->stream_name_utf16,
- old->ntfs_loc->stream_name_utf16,
- loc->stream_name_utf16_num_chars * 2);
+ memcpy(loc->stream_name,
+ old->ntfs_loc->stream_name,
+ (loc->stream_name_nchars + 1) * 2);
}
break;
#endif
case RESOURCE_IN_STAGING_FILE:
case RESOURCE_IN_ATTACHED_BUFFER:
case RESOURCE_IN_FILE_ON_DISK:
+#ifdef __WIN32__
+ case RESOURCE_WIN32:
+#endif
BUILD_BUG_ON((void*)<e->file_on_disk !=
(void*)<e->staging_file_name);
BUILD_BUG_ON((void*)<e->file_on_disk !=
#ifdef WITH_NTFS_3G
case RESOURCE_IN_NTFS_VOLUME:
if (lte->ntfs_loc) {
- FREE(lte->ntfs_loc->path_utf8);
- FREE(lte->ntfs_loc->stream_name_utf16);
+ FREE(lte->ntfs_loc->path);
+ FREE(lte->ntfs_loc->stream_name);
FREE(lte->ntfs_loc);
}
break;
* Inserts an entry into the lookup table.
*
* @table: A pointer to the lookup table.
- * @entry: A pointer to the entry to insert.
+ * @lte: A pointer to the entry to insert.
*/
void lookup_table_insert(struct wim_lookup_table *table,
struct wim_lookup_table_entry *lte)
ERROR("The WIM lookup table contains two entries with the "
"same SHA1 message digest!");
ERROR("The first entry is:");
- print_lookup_table_entry(duplicate_entry);
+ print_lookup_table_entry(duplicate_entry, stderr);
ERROR("The second entry is:");
- print_lookup_table_entry(cur_entry);
+ print_lookup_table_entry(cur_entry, stderr);
#endif
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
ERROR("Found uncompressed resource with original size "
"not the same as compressed size");
ERROR("The lookup table entry for the resource is as follows:");
- print_lookup_table_entry(cur_entry);
+ print_lookup_table_entry(cur_entry, stderr);
#endif
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
{
#ifdef ENABLE_ERROR_MESSAGES
ERROR("Found metadata resource with refcnt != 1:");
- print_lookup_table_entry(cur_entry);
+ print_lookup_table_entry(cur_entry, stderr);
#endif
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
return 0;
}
-void print_lookup_table_entry(const struct wim_lookup_table_entry *lte)
+void print_lookup_table_entry(const struct wim_lookup_table_entry *lte,
+ FILE *out)
{
if (!lte) {
- putchar('\n');
+ putc('\n', out);
return;
}
- printf("Offset = %"PRIu64" bytes\n",
+ fprintf(out, "Offset = %"PRIu64" bytes\n",
lte->resource_entry.offset);
- printf("Size = %"PRIu64" bytes\n",
+ fprintf(out, "Size = %"PRIu64" bytes\n",
(u64)lte->resource_entry.size);
- printf("Original size = %"PRIu64" bytes\n",
+ fprintf(out, "Original size = %"PRIu64" bytes\n",
lte->resource_entry.original_size);
- printf("Part Number = %hu\n", lte->part_number);
- printf("Reference Count = %u\n", lte->refcnt);
- printf("Hash = 0x");
+ fprintf(out, "Part Number = %hu\n", lte->part_number);
+ fprintf(out, "Reference Count = %u\n", lte->refcnt);
+ fprintf(out, "Hash = 0x");
print_hash(lte->hash);
- putchar('\n');
- printf("Flags = ");
+ putc('\n', out);
+ fprintf(out, "Flags = ");
u8 flags = lte->resource_entry.flags;
if (flags & WIM_RESHDR_FLAG_COMPRESSED)
- fputs("WIM_RESHDR_FLAG_COMPRESSED, ", stdout);
+ fputs("WIM_RESHDR_FLAG_COMPRESSED, ", out);
if (flags & WIM_RESHDR_FLAG_FREE)
- fputs("WIM_RESHDR_FLAG_FREE, ", stdout);
+ fputs("WIM_RESHDR_FLAG_FREE, ", out);
if (flags & WIM_RESHDR_FLAG_METADATA)
- fputs("WIM_RESHDR_FLAG_METADATA, ", stdout);
+ fputs("WIM_RESHDR_FLAG_METADATA, ", out);
if (flags & WIM_RESHDR_FLAG_SPANNED)
- fputs("WIM_RESHDR_FLAG_SPANNED, ", stdout);
- putchar('\n');
+ fputs("WIM_RESHDR_FLAG_SPANNED, ", out);
+ putc('\n', out);
switch (lte->resource_location) {
case RESOURCE_IN_WIM:
if (lte->wim->filename) {
- printf("WIM file = `%s'\n",
+ fprintf(out, "WIM file = `%s'\n",
lte->wim->filename);
}
break;
case RESOURCE_IN_FILE_ON_DISK:
- printf("File on Disk = `%s'\n", lte->file_on_disk);
+ fprintf(out, "File on Disk = `%s'\n", lte->file_on_disk);
break;
case RESOURCE_IN_STAGING_FILE:
- printf("Staging File = `%s'\n", lte->staging_file_name);
+ fprintf(out, "Staging File = `%s'\n", lte->staging_file_name);
break;
default:
break;
}
- putchar('\n');
+ putc('\n', out);
}
static int do_print_lookup_table_entry(struct wim_lookup_table_entry *lte,
- void *ignore)
+ void *fp)
{
- print_lookup_table_entry(lte);
+ print_lookup_table_entry(lte, (FILE*)fp);
return 0;
}
{
for_lookup_table_entry(w->lookup_table,
do_print_lookup_table_entry,
- NULL);
+ stdout);
}
/* Given a SHA1 message digest, return the corresponding entry in the WIM's
*
* This is only for pre-resolved inodes.
*/
-int lookup_resource(WIMStruct *w, const char *path,
- int lookup_flags,
- struct wim_dentry **dentry_ret,
- struct wim_lookup_table_entry **lte_ret,
- u16 *stream_idx_ret)
+int
+lookup_resource(WIMStruct *w,
+ const mbchar *path,
+ int lookup_flags,
+ struct wim_dentry **dentry_ret,
+ struct wim_lookup_table_entry **lte_ret,
+ u16 *stream_idx_ret)
{
struct wim_dentry *dentry;
struct wim_lookup_table_entry *lte;
u16 stream_idx;
- const char *stream_name = NULL;
+ const mbchar *stream_name = NULL;
struct wim_inode *inode;
- char *p = NULL;
+ mbchar *p = NULL;
if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
stream_name = path_stream_name(path);
if (stream_name) {
- p = (char*)stream_name - 1;
+ p = (mbchar*)stream_name - 1;
*p = '\0';
}
}
if (p)
*p = ':';
if (!dentry)
- return -ENOENT;
+ return -errno;
inode = dentry->d_inode;
git://wimlib.net / wimlib / blobdiff