Character encoding changes (IN PROGRESS)

[wimlib] / src / lookup_table.c

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 390f63c5934401ebf810466254d90ff6b6ac0305..f8a2aef04749df1846056165d6eb7e0f4856fa22 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -86,6 +86,9 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old)
        switch (new->resource_location) {
        case RESOURCE_IN_STAGING_FILE:
        case RESOURCE_IN_FILE_ON_DISK:
+#ifdef __WIN32__
+       case RESOURCE_WIN32:
+#endif
                BUILD_BUG_ON((void*)&old->file_on_disk !=
                             (void*)&old->staging_file_name);
                new->staging_file_name = STRDUP(old->staging_file_name);
@@ -107,18 +110,18 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old)
                        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
@@ -138,6 +141,9 @@ void free_lookup_table_entry(struct wim_lookup_table_entry *lte)
                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*)&lte->file_on_disk !=
                                     (void*)&lte->staging_file_name);
                        BUILD_BUG_ON((void*)&lte->file_on_disk !=
@@ -147,8 +153,8 @@ void free_lookup_table_entry(struct wim_lookup_table_entry *lte)
 #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;
@@ -186,7 +192,7 @@ void free_lookup_table(struct wim_lookup_table *table)
  * 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)
@@ -566,23 +572,25 @@ __lookup_resource(const struct wim_lookup_table *table, const u8 hash[])
  *
  * 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';
                }
        }
@@ -591,7 +599,7 @@ int lookup_resource(WIMStruct *w, const char *path,
        if (p)
                *p = ':';
        if (!dentry)
-               return -ENOENT;
+               return -errno;
 
        inode = dentry->d_inode;