* wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include <errno.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "dentry.h"
#include "buffer_io.h"
+#include "dentry.h"
#include "lookup_table.h"
-#include "sha1.h"
#include "timestamp.h"
#include "wimlib_internal.h"
-
/* Calculates the unaligned length, in bytes, of an on-disk WIM dentry that has
* a file name and short name that take the specified numbers of bytes. This
* excludes any alternate data stream entries that may follow the dentry. */
size_t utf8_len;
size_t utf16_len;
char *name_utf16, *name_utf8;
+ int ret;
utf8_len = strlen(name);
-
- name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len);
-
- if (!name_utf16)
- return WIMLIB_ERR_NOMEM;
+ ret = utf8_to_utf16(name, utf8_len, &name_utf16, &utf16_len);
+ if (ret != 0)
+ return ret;
name_utf8 = MALLOC(utf8_len + 1);
if (!name_utf8) {
ret = get_names(&dentry->file_name, &dentry->file_name_utf8,
&dentry->file_name_len, &dentry->file_name_utf8_len,
- new_name);
- FREE(dentry->short_name);
- dentry->short_name_len = 0;
- if (ret == 0)
+ new_name);
+ if (ret == 0) {
+ if (dentry->short_name_len) {
+ FREE(dentry->short_name);
+ dentry->short_name_len = 0;
+ }
dentry->length = dentry_correct_length(dentry);
+ }
return ret;
}
return __dentry_total_length(dentry, dentry->length);
}
-#ifdef WITH_FUSE
-/* Transfers file attributes from a struct inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte,
- struct stat *stbuf)
-{
- if (inode_is_symlink(inode))
- stbuf->st_mode = S_IFLNK | 0777;
- else if (inode_is_directory(inode))
- stbuf->st_mode = S_IFDIR | 0755;
- else
- stbuf->st_mode = S_IFREG | 0755;
-
- stbuf->st_ino = (ino_t)inode->ino;
- stbuf->st_nlink = inode->link_count;
- stbuf->st_uid = getuid();
- stbuf->st_gid = getgid();
-
- if (lte) {
- if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- wimlib_assert(lte->staging_file_name);
- struct stat native_stat;
- if (stat(lte->staging_file_name, &native_stat) != 0) {
- DEBUG("Failed to stat `%s': %m",
- lte->staging_file_name);
- return -errno;
- }
- stbuf->st_size = native_stat.st_size;
- } else {
- stbuf->st_size = wim_resource_size(lte);
- }
- } else {
- stbuf->st_size = 0;
- }
-
- stbuf->st_atime = wim_timestamp_to_unix(inode->last_access_time);
- stbuf->st_mtime = wim_timestamp_to_unix(inode->last_write_time);
- stbuf->st_ctime = wim_timestamp_to_unix(inode->creation_time);
- stbuf->st_blocks = (stbuf->st_size + 511) / 512;
- return 0;
-}
-#endif
-
int for_dentry_in_rbtree(struct rb_node *root,
int (*visitor)(struct dentry *, void *),
void *arg)
*
* Returns a pointer to the new dentry, or NULL if out of memory.
*/
+#ifndef WITH_FUSE
+static
+#endif
struct dentry *new_dentry(const char *name)
{
struct dentry *dentry;
return dentry;
err:
FREE(dentry);
- ERROR("Failed to allocate new dentry");
+ ERROR_WITH_ERRNO("Failed to create new dentry with name \"%s\"", name);
return NULL;
}
wimlib_assert(inode->num_opened_fds == 0);
FREE(inode->fds);
pthread_mutex_destroy(&inode->i_mutex);
+ if (inode->hlist.pprev)
+ hlist_del(&inode->hlist);
#endif
FREE(inode->extracted_file);
FREE(inode);
}
get_bytes(p, cur_entry->stream_name_len,
(u8*)cur_entry->stream_name);
- cur_entry->stream_name_utf8 = utf16_to_utf8(cur_entry->stream_name,
- cur_entry->stream_name_len,
- &utf8_len);
- cur_entry->stream_name_utf8_len = utf8_len;
- if (!cur_entry->stream_name_utf8) {
- ret = WIMLIB_ERR_NOMEM;
+ ret = utf16_to_utf8(cur_entry->stream_name,
+ cur_entry->stream_name_len,
+ &cur_entry->stream_name_utf8,
+ &utf8_len);
+ if (ret != 0)
goto out_free_ads_entries;
- }
+ cur_entry->stream_name_utf8_len = utf8_len;
}
/* It's expected that the size of every ADS entry is a multiple
* of 8. However, to be safe, I'm allowing the possibility of
p = get_bytes(p, file_name_len, file_name);
/* Convert filename to UTF-8. */
- file_name_utf8 = utf16_to_utf8(file_name, file_name_len,
- &file_name_utf8_len);
-
- if (!file_name_utf8) {
- ERROR("Failed to allocate memory to convert UTF-16 "
- "filename (%hu bytes) to UTF-8", file_name_len);
- ret = WIMLIB_ERR_NOMEM;
+ ret = utf16_to_utf8(file_name, file_name_len, &file_name_utf8,
+ &file_name_utf8_len);
+ if (ret != 0)
goto out_free_file_name;
- }
if (*(u16*)p)
WARNING("Expected two zero bytes following the file name "
"`%s', but found non-zero bytes", file_name_utf8);
/* Recursively write the rest of the dentry tree. */
return write_dentry_tree_recursive(root, p);
}
-