static int file_writable(const char *path)
{
int ret;
- ret = access(path, F_OK | W_OK);
+ ret = access(path, W_OK);
if (ret != 0)
imagex_error_with_errno("Can't modify `%s'", path);
return ret;
ret = file_writable(dest_wimfile);
if (ret != 0)
- return ret;
+ goto out;
dest_ctype = wimlib_get_compression_type(dest_w);
if (compression_type_specified
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
ret = file_writable(wimfile);
if (ret != 0)
- return ret;
+ goto out;
}
ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms,
argv++;
wimlib_set_print_errors(true);
+ ret = wimlib_global_init();
+ if (ret)
+ goto out;
for_imagex_command(cmd) {
if (strcmp(cmd->name, *argv) == 0) {
ret = cmd->func(argc, argv);
- if (ret > 0) {
- imagex_error("Exiting with error code %d:\n"
- " %s.", ret,
- wimlib_get_error_string(ret));
- if (ret == WIMLIB_ERR_NTFS_3G)
- imagex_error_with_errno("errno");
- }
- return ret;
+ goto out;
}
}
imagex_error("Unrecognized command: `%s'", argv[0]);
usage_all();
return 1;
+out:
+ if (ret > 0) {
+ imagex_error("Exiting with error code %d:\n"
+ " %s.", ret,
+ wimlib_get_error_string(ret));
+ if (ret == WIMLIB_ERR_NTFS_3G && errno != 0)
+ imagex_error_with_errno("errno");
+ }
+ wimlib_global_cleanup();
+ return ret;
}