#include "xml.h"
#include <errno.h>
-/* Creates a new directory to place in the WIM image. This is to create parent
- * directories that are not part of any target as needed. */
-static int
-new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret)
-{
- int ret;
- struct wim_dentry *dentry;
-
- DEBUG("Creating filler directory \"%"TS"\"", name);
- ret = new_dentry_with_inode(name, &dentry);
- if (ret)
- goto out;
- /* Leave the inode number as 0; this is allowed for non
- * hard-linked files. */
- dentry->d_inode->i_resolved = 1;
- dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
- *dentry_ret = dentry;
- ret = 0;
-out:
- return ret;
-}
+#ifdef __WIN32__
+# include "win32.h"
+#endif
/* Overlays @branch onto @target, both of which must be directories. */
static int
flags = delete_cmd->delete.delete_flags;
wim_path = delete_cmd->delete.wim_path;
+ DEBUG("Deleting WIM path \"%"TS"\" (flags=%#x)", wim_path, flags);
+
tree = get_dentry(wim, wim_path);
if (!tree) {
/* Path to delete does not exist in the WIM. */
return 0;
}
-/*
+/*
* Rename a file or directory in the WIM.
*
* This is also called from wimfs_rename() in the FUSE mount code.
ret = WIMLIB_ERR_NOTDIR;
break;
case -ENOTEMPTY:
+ ret = WIMLIB_ERR_NOTEMPTY;
+ break;
case -EISDIR:
ret = WIMLIB_ERR_IS_DIRECTORY;
break;
ret = execute_rename_command(wim, &cmds[i]);
break;
default:
- ret = WIMLIB_ERR_INVALID_PARAM;
+ wimlib_assert(0);
break;
}
if (ret)
break;
- wim->image_metadata[wim->current_image - 1]->modified = 1;
}
return ret;
}
}
if (add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
ERROR("Capturing UNIX-specific data is not supported on Windows");
- return WIMLIB_ERR_INVALID_PARAM;
+ return WIMLIB_ERR_UNSUPPORTED;
}
if (add_flags & WIMLIB_ADD_FLAG_DEREFERENCE) {
ERROR("Dereferencing symbolic links is not supported on Windows");
- return WIMLIB_ERR_INVALID_PARAM;
+ return WIMLIB_ERR_UNSUPPORTED;
}
#endif
{
if (cmds) {
for (size_t i = 0; i < num_cmds; i++) {
- switch (cmds->op) {
+ switch (cmds[i].op) {
case WIMLIB_UPDATE_OP_ADD:
FREE(cmds[i].add.fs_source_path);
FREE(cmds[i].add.wim_target_path);
FREE(cmds[i].rename.wim_source_path);
FREE(cmds[i].rename.wim_target_path);
break;
+ default:
+ wimlib_assert(0);
}
}
FREE(cmds);
if (ret)
goto out_free_cmds_copy;
+ wim->image_metadata[image - 1]->modified = 1;
+
/* Statistics about the WIM image, such as the numbers of files and
* directories, may have changed. Call xml_update_image_info() to
* recalculate these statistics. */
- xml_update_image_info(wim, wim->current_image);
+ xml_update_image_info(wim, image);
out_free_cmds_copy:
free_update_commands(cmds_copy, num_cmds);
out: