X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.h;h=6a3affcdb56a66d0ae82b0466b6a1a28a239c21c;hb=276f9f9f9658f4a8bafd6216db46760abe8c848d;hp=dfbcafca9b4b6c32c9f4aba510f4a542c1edfb3f;hpb=14baa6ae892debbaa18dba8119931580efd0e517;p=wimlib

diff --git a/src/dentry.h b/src/dentry.h
index dfbcafca..6a3affcd 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -141,7 +141,8 @@ struct wim_dentry {
 	 * the terminating null character. */
 	u16 file_name_nbytes;
 
-	/* Length of full path name, in bytes, as a multibyte-encoded string */
+	/* Length of full path name encoded using "tchars", in bytes, not
+	 * including the terminating null terminator. */
 	u32 full_path_nbytes;
 
 	u8 is_extracted : 1;
@@ -195,7 +196,7 @@ struct wim_dentry {
 	utf16lechar *file_name;
 
 	/* Full path of this dentry */
-	mbchar *full_path;
+	tchar *full_path;
 };
 
 #define rbnode_dentry(node) container_of(node, struct wim_dentry, rb_node)
@@ -271,7 +272,7 @@ struct wim_inode {
 
 	struct list_head i_lte_inode_list;
 
-	mbchar *i_extracted_file;
+	tchar *i_extracted_file;
 
 	/* Root of a red-black tree storing the children of this inode (if
 	 * non-empty, implies the inode is a directory, although that is also
@@ -344,24 +345,25 @@ extern void
 calculate_subdir_offsets(struct wim_dentry *dentry, u64 *subdir_offset_p);
 
 extern int
-set_dentry_name(struct wim_dentry *dentry, const mbchar *new_name);
+set_dentry_name(struct wim_dentry *dentry, const tchar *new_name);
 
 extern struct wim_dentry *
-get_dentry(struct WIMStruct *w, const mbchar *path);
+get_dentry(struct WIMStruct *w, const tchar *path);
 
 extern struct wim_inode *
-wim_pathname_to_inode(struct WIMStruct *w, const mbchar *path);
+wim_pathname_to_inode(struct WIMStruct *w, const tchar *path);
 
 extern struct wim_dentry *
 get_dentry_child_with_name(const struct wim_dentry *dentry,
-			   const mbchar *name);
+			   const tchar *name);
 
 extern struct wim_dentry *
 get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry,
-				   const utf16lechar *name);
+				   const utf16lechar *name,
+				   size_t name_nbytes);
 
 extern struct wim_dentry *
-get_parent_dentry(struct WIMStruct *w, const mbchar *path);
+get_parent_dentry(struct WIMStruct *w, const tchar *path);
 
 extern int
 print_dentry(struct wim_dentry *dentry, void *lookup_table);
@@ -369,14 +371,14 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table);
 extern int
 print_dentry_full_path(struct wim_dentry *entry, void *ignore);
 
-extern struct
-wim_dentry *new_dentry(const mbchar *name);
+extern int
+new_dentry(const tchar *name, struct wim_dentry **dentry_ret);
 
-extern struct wim_dentry *
-new_dentry_with_inode(const mbchar *name);
+extern int
+new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret);
 
-extern struct wim_dentry *
-new_dentry_with_timeless_inode(const mbchar *name);
+extern int
+new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret);
 
 extern void
 free_inode(struct wim_inode *inode);
@@ -402,14 +404,19 @@ dentry_add_child(struct wim_dentry * restrict parent,
 		 struct wim_dentry * restrict child);
 
 extern struct wim_ads_entry *
-inode_get_ads_entry(struct wim_inode *inode, const mbchar *stream_name,
+inode_get_ads_entry(struct wim_inode *inode, const tchar *stream_name,
 		    u16 *idx_ret);
 
 extern struct wim_ads_entry *
-inode_add_ads(struct wim_inode *dentry, const mbchar *stream_name);
+inode_add_ads_utf16le(struct wim_inode *inode,
+		      const utf16lechar *stream_name,
+		      size_t stream_name_nbytes);
+
+extern struct wim_ads_entry *
+inode_add_ads(struct wim_inode *dentry, const tchar *stream_name);
 
 extern int
-inode_add_ads_with_data(struct wim_inode *inode, const mbchar *name,
+inode_add_ads_with_data(struct wim_inode *inode, const tchar *name,
 			const void *value, size_t size,
 			struct wim_lookup_table *lookup_table);
 
@@ -417,9 +424,12 @@ extern void
 inode_remove_ads(struct wim_inode *inode, u16 idx,
 		 struct wim_lookup_table *lookup_table);
 
+
 #define WIMLIB_UNIX_DATA_TAG "$$__wimlib_UNIX_data"
+#define WIMLIB_UNIX_DATA_TAG_NBYTES (sizeof(WIMLIB_UNIX_DATA_TAG) - 1)
 
-#define WIMLIB_UNIX_DATA_TAG_LEN (sizeof(WIMLIB_UNIX_DATA_TAG) - 1)
+#define WIMLIB_UNIX_DATA_TAG_UTF16LE "$\0$\0_\0_\0w\0i\0m\0l\0i\0b\0_\0U\0N\0I\0X\0_\0d\0a\0t\0a\0"
+#define WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES (sizeof(WIMLIB_UNIX_DATA_TAG_UTF16LE) - 1)
 
 /* Format for special alternate data stream entries to store UNIX data for files
  * and directories (see: WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */
@@ -514,4 +524,16 @@ dentry_has_children(const struct wim_dentry *dentry)
 	return inode_has_children(dentry->d_inode);
 }
 
+static inline bool
+dentry_has_short_name(const struct wim_dentry *dentry)
+{
+	return dentry->short_name_nbytes != 0;
+}
+
+static inline bool
+dentry_has_long_name(const struct wim_dentry *dentry)
+{
+	return dentry->file_name_nbytes != 0;
+}
+
 #endif