}
#endif
-#ifdef __WIN32__
- win32_acquire_restore_privileges();
-#endif
if (wim) {
ret = wimlib_extract_image(wim, image, target, extract_flags,
additional_swms, num_additional_swms,
}
if (ret == 0)
imagex_printf(T("Done applying WIM image.\n"));
-#ifdef __WIN32__
- win32_release_restore_privileges();
-#endif
out_free_swms:
for (unsigned i = 0; i < num_additional_swms; i++)
wimlib_free(additional_swms[i]);
tsprintf(name_end, T(" (%lu)"), conflict_idx);
}
}
-#ifdef __WIN32__
- win32_acquire_capture_privileges();
-#endif
-
ret = wimlib_add_image_multisource(wim,
capture_sources,
num_sources,
add_image_flags,
imagex_progress_func);
if (ret)
- goto out_release_privs;
+ goto out_wimlib_free;
if (desc || flags_element) {
/* User provided <DESCRIPTION> or <FLAGS> element. Get the
info.image_count,
desc);
if (ret)
- goto out_release_privs;
+ goto out_wimlib_free;
}
if (flags_element) {
ret = wimlib_set_image_flags(wim, info.image_count,
flags_element);
if (ret)
- goto out_release_privs;
+ goto out_wimlib_free;
}
}
write_flags, num_threads,
imagex_progress_func);
}
-out_release_privs:
-#ifdef __WIN32__
- win32_release_capture_privileges();
-#endif
out_wimlib_free:
wimlib_free(wim);
out_free_config:
num_additional_swms = 0;
}
-#ifdef __WIN32__
- win32_acquire_restore_privileges();
-#endif
-
ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0,
additional_swms, num_additional_swms,
imagex_progress_func);
" are in the WIM image.\n"),
get_cmd_string(CMD_INFO, false));
}
-#ifdef __WIN32__
- win32_release_restore_privileges();
-#endif
for (unsigned i = 0; i < num_additional_swms; i++)
wimlib_free(additional_swms[i]);
free(additional_swms);
}
}
-#ifdef __WIN32__
- if (have_add_command)
- win32_acquire_capture_privileges();
-#endif
-
/* Execute the update commands */
ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags,
imagex_progress_func);
if (ret)
- goto out_release_privs;
+ goto out_free_cmds;
/* Overwrite the updated WIM */
ret = wimlib_overwrite(wim, write_flags, num_threads,
imagex_progress_func);
-out_release_privs:
-#ifdef __WIN32__
- if (have_add_command)
- win32_release_capture_privileges();
-#endif
+out_free_cmds:
free(cmds);
out_free_cmd_file_contents:
free(cmd_file_contents);
static void
version(void)
{
- static const tchar *format =
+ static const tchar *s =
T(
-"%"TS" (" PACKAGE ") " PACKAGE_VERSION "\n"
+IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n"
"Copyright (C) 2012, 2013 Eric Biggers\n"
"License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
"This is free software: you are free to change and redistribute it.\n"
"\n"
"Report bugs to "PACKAGE_BUGREPORT".\n"
);
- tprintf(format, invocation_name);
+ tfputs(s, stdout);
}
exit(2);
}
- /* Enable warning and error messages in the library to be more
- * user-friendly. */
+ /* Enable warning and error messages in wimlib be more user-friendly.
+ * */
wimlib_set_print_errors(true);
/* Initialize wimlib. */