X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=69d7a6c74e7e5760a04c30d44d2d4f5934d1a3b9;hb=0edea6a7d2affc25ee132e00551cea69fd20a4a8;hp=1eb8489b03888f109ba5d35bb4479cbcda8fb07d;hpb=4e32f48feb64932954953a87f064170500f93221;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index 1eb8489b..69d7a6c7 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012-2016 Eric Biggers
+ * Copyright (C) 2012-2018 Eric Biggers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -131,14 +131,31 @@ enum {
 static void usage(int cmd, FILE *fp);
 static void usage_all(FILE *fp);
 static void recommend_man_page(int cmd, FILE *fp);
-static const tchar *get_cmd_string(int cmd, bool nospace);
+static const tchar *get_cmd_string(int cmd, bool only_short_form);
 
-static bool imagex_be_quiet = false;
 static FILE *imagex_info_file;
 
-#define imagex_printf(format, ...) \
+#define imagex_printf(format, ...)	\
+	if (imagex_info_file)		\
 		tfprintf(imagex_info_file, format, ##__VA_ARGS__)
 
+static void imagex_suppress_output(void)
+{
+	imagex_info_file = NULL;
+}
+
+static void imagex_output_to_stderr(void)
+{
+	if (imagex_info_file)
+		imagex_info_file = stderr;
+}
+
+static void imagex_flush_output(void)
+{
+	if (imagex_info_file)
+		fflush(imagex_info_file);
+}
+
 enum {
 	IMAGEX_ALLOW_OTHER_OPTION,
 	IMAGEX_BLOBS_OPTION,
@@ -490,7 +507,7 @@ verify_image_exists_and_is_single(int image, const tchar *image_name,
 static void
 print_available_compression_types(FILE *fp)
 {
-	static const tchar *s =
+	static const tchar * const s =
 	T(
 	"Available compression types:\n"
 	"\n"
@@ -1141,8 +1158,6 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	unsigned unit_shift;
 	const tchar *unit_name;
 
-	if (imagex_be_quiet)
-		return WIMLIB_PROGRESS_STATUS_CONTINUE;
 	switch (msg) {
 	case WIMLIB_PROGRESS_MSG_WRITE_STREAMS:
 		{
@@ -1381,7 +1396,7 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	default:
 		break;
 	}
-	fflush(imagex_info_file);
+	imagex_flush_output();
 	return WIMLIB_PROGRESS_STATUS_CONTINUE;
 }
 
@@ -1852,7 +1867,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	STRING_LIST(base_wimfiles);
 	WIMStruct **base_wims;
 
-	WIMStruct *template_wim;
+	WIMStruct *template_wim = NULL;
 	const tchar *template_wimfile = NULL;
 	const tchar *template_image_name_or_num = NULL;
 	int template_image = WIMLIB_NO_IMAGE;
@@ -1986,11 +2001,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			}
 			break;
 		case IMAGEX_DELTA_FROM_OPTION:
-			if (cmd != CMD_CAPTURE) {
-				imagex_error(T("'--delta-from' is only "
-					       "valid for capture!"));
-				goto out_usage;
-			}
 			ret = string_list_append(&base_wimfiles, optarg);
 			if (ret)
 				goto out;
@@ -2062,7 +2072,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 		}
 		wim_fd = STDOUT_FILENO;
 		wimfile = NULL;
-		imagex_info_file = stderr;
+		imagex_output_to_stderr();
 		set_fd_to_binary_mode(wim_fd);
 	}
 
@@ -2276,13 +2286,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	 * open the WIM if needed and parse the image index.  */
 	if (template_image_name_or_num) {
 
-
-		if (base_wimfiles.num_strings == 1 &&
-		    template_wimfile == base_wimfiles.strings[0]) {
-			template_wim = base_wims[0];
-		} else if (template_wimfile == wimfile) {
+		if (cmd == CMD_APPEND && !tstrcmp(template_wimfile, wimfile)) {
 			template_wim = wim;
 		} else {
+			for (size_t i = 0; i < base_wimfiles.num_strings; i++) {
+				if (!tstrcmp(template_wimfile,
+					     base_wimfiles.strings[i])) {
+					template_wim = base_wims[i];
+					break;
+				}
+			}
+		}
+
+		if (!template_wim) {
 			ret = wimlib_open_wim_with_progress(template_wimfile,
 							    open_flags,
 							    &template_wim,
@@ -2314,8 +2330,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 							template_wimfile);
 		if (ret)
 			goto out_free_template_wim;
-	} else {
-		template_wim = NULL;
 	}
 
 	ret = wimlib_add_image_multisource(wim,
@@ -2367,10 +2381,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 					 write_flags, num_threads);
 	}
 out_free_template_wim:
-	/* template_wim may alias base_wims[0] or wim.  */
-	if ((base_wimfiles.num_strings != 1 || template_wim != base_wims[0]) &&
-	    template_wim != wim)
-		wimlib_free(template_wim);
+	/* 'template_wim' may alias 'wim' or any of the 'base_wims' */
+	if (template_wim == wim)
+		goto out_free_base_wims;
+	for (size_t i = 0; i < base_wimfiles.num_strings; i++)
+		if (template_wim == base_wims[i])
+			goto out_free_base_wims;
+	wimlib_free(template_wim);
 out_free_base_wims:
 	for (size_t i = 0; i < base_wimfiles.num_strings; i++)
 		wimlib_free(base_wims[i]);
@@ -2504,21 +2521,21 @@ static const struct {
 #define TIMESTR_MAX 100
 
 static void
-timespec_to_string(const struct timespec *spec, tchar *buf)
+print_time(const tchar *type, const struct wimlib_timespec *wts,
+	   int32_t high_part)
 {
-	time_t t = spec->tv_sec;
+	tchar timestr[TIMESTR_MAX];
+	time_t t;
 	struct tm tm;
-	gmtime_r(&t, &tm);
-	tstrftime(buf, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm);
-	buf[TIMESTR_MAX - 1] = '\0';
-}
 
-static void
-print_time(const tchar *type, const struct timespec *spec)
-{
-	tchar timestr[TIMESTR_MAX];
+	if (sizeof(wts->tv_sec) == 4 && sizeof(t) > sizeof(wts->tv_sec))
+		t = (uint32_t)wts->tv_sec | ((uint64_t)high_part << 32);
+	else
+		t = wts->tv_sec;
 
-	timespec_to_string(spec, timestr);
+	gmtime_r(&t, &tm);
+	tstrftime(timestr, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm);
+	timestr[TIMESTR_MAX - 1] = '\0';
 
 	tprintf(T("%-20"TS"= %"TS"\n"), type, timestr);
 }
@@ -2679,9 +2696,12 @@ print_dentry_detailed(const struct wimlib_dir_entry *dentry)
 					  dentry->security_descriptor_size);
 	}
 
-	print_time(T("Creation Time"), &dentry->creation_time);
-	print_time(T("Last Write Time"), &dentry->last_write_time);
-	print_time(T("Last Access Time"), &dentry->last_access_time);
+	print_time(T("Creation Time"),
+		   &dentry->creation_time, dentry->creation_time_high);
+	print_time(T("Last Write Time"),
+		   &dentry->last_write_time, dentry->last_write_time_high);
+	print_time(T("Last Access Time"),
+		   &dentry->last_access_time, dentry->last_access_time_high);
 
 
 	if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT)
@@ -2968,7 +2988,7 @@ imagex_export(int argc, tchar **argv, int cmd)
 	#endif
 		dest_wimfile = NULL;
 		dest_wim_fd = STDOUT_FILENO;
-		imagex_info_file = stderr;
+		imagex_output_to_stderr();
 		set_fd_to_binary_mode(dest_wim_fd);
 	}
 	errno = ENOENT;
@@ -2976,9 +2996,9 @@ imagex_export(int argc, tchar **argv, int cmd)
 		wim_is_new = false;
 		/* Destination file exists. */
 
-		if (!S_ISREG(stbuf.st_mode)) {
-			imagex_error(T("\"%"TS"\" is not a regular file"),
-				     dest_wimfile);
+		if (!S_ISREG(stbuf.st_mode) && !S_ISBLK(stbuf.st_mode)) {
+			imagex_error(T("\"%"TS"\" is not a regular file "
+				       "or block device"), dest_wimfile);
 			ret = -1;
 			goto out_free_src_wim;
 		}
@@ -3182,8 +3202,7 @@ imagex_extract(int argc, tchar **argv, int cmd)
 			break;
 		case IMAGEX_TO_STDOUT_OPTION:
 			extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT;
-			imagex_info_file = stderr;
-			imagex_be_quiet = true;
+			imagex_suppress_output();
 			set_fd_to_binary_mode(STDOUT_FILENO);
 			break;
 		case IMAGEX_INCLUDE_INVALID_NAMES_OPTION:
@@ -3279,8 +3298,7 @@ imagex_extract(int argc, tchar **argv, int cmd)
 	}
 
 	if (ret == 0) {
-		if (!imagex_be_quiet)
-			imagex_printf(T("Done extracting files.\n"));
+		imagex_printf(T("Done extracting files.\n"));
 	} else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) {
 		if ((extract_flags & (WIMLIB_EXTRACT_FLAG_STRICT_GLOB |
 				      WIMLIB_EXTRACT_FLAG_GLOB_PATHS))
@@ -4378,14 +4396,15 @@ static const struct imagex_command imagex_commands[] = {
 
 #endif
 
-static const tchar *usage_strings[] = {
+static const tchar * const usage_strings[] = {
 [CMD_APPEND] =
 T(
 "    %"TS" " SOURCE_STR " WIMFILE [IMAGE_NAME [IMAGE_DESC]]\n"
 "                    [--boot] [--check] [--nocheck] [--config=FILE]\n"
 "                    [--threads=NUM_THREADS] [--no-acls] [--strict-acls]\n"
 "                    [--rpfix] [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n"
-"                    [--wimboot] [--unix-data] [--dereference] [--snapshot]\n"
+"                    [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n"
+"                    [--dereference] [--snapshot]\n"
 ),
 [CMD_APPLY] =
 T(
@@ -4411,7 +4430,7 @@ T(
 ),
 [CMD_DIR] =
 T(
-"    %"TS" WIMFILE IMAGE [--path=PATH] [--detailed]\n"
+"    %"TS" WIMFILE [IMAGE] [--path=PATH] [--detailed]\n"
 ),
 [CMD_EXPORT] =
 T(
@@ -4489,21 +4508,18 @@ T(
 static const tchar *invocation_name;
 static int invocation_cmd = CMD_NONE;
 
-static const tchar *get_cmd_string(int cmd, bool nospace)
+static const tchar *get_cmd_string(int cmd, bool only_short_form)
 {
 	static tchar buf[50];
-	if (cmd == CMD_NONE) {
+
+	if (cmd == CMD_NONE)
 		return T("wimlib-imagex");
-	} else if (invocation_cmd != CMD_NONE) {
+
+	if (only_short_form || invocation_cmd != CMD_NONE) {
 		tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name);
 	} else {
-		const tchar *format;
-
-		if (nospace)
-			format = T("%"TS"-%"TS"");
-		else
-			format = T("%"TS" %"TS"");
-		tsprintf(buf, format, invocation_name, imagex_commands[cmd].name);
+		tsprintf(buf, T("%"TS" %"TS), invocation_name,
+			 imagex_commands[cmd].name);
 	}
 	return buf;
 }
@@ -4511,23 +4527,23 @@ static const tchar *get_cmd_string(int cmd, bool nospace)
 static void
 version(void)
 {
-	static const tchar *s =
+	static const tchar * const fmt =
 	T(
-"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
-"Copyright (C) 2012-2016 Eric Biggers\n"
+"wimlib-imagex " PACKAGE_VERSION " (using wimlib %"TS")\n"
+"Copyright (C) 2012-2018 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"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 "\n"
 "Report bugs to "PACKAGE_BUGREPORT".\n"
 	);
-	tfputs(s, stdout);
+	tfprintf(stdout, fmt, wimlib_get_version_string());
 }
 
-
 static void
-help_or_version(int argc, tchar **argv, int cmd)
+do_common_options(int *argc_p, tchar **argv, int cmd)
 {
+	int argc = *argc_p;
 	int i;
 	const tchar *p;
 
@@ -4544,9 +4560,18 @@ help_or_version(int argc, tchar **argv, int cmd)
 			} else if (!tstrcmp(p, T("version"))) {
 				version();
 				exit(0);
-			}
+			} else if (!tstrcmp(p, T("quiet"))) {
+				imagex_suppress_output();
+				memmove(&argv[i], &argv[i + 1],
+					(argc - i) * sizeof(argv[i]));
+				argc--;
+				i--;
+			} else if (!*p) /* reached "--", no more options */
+				break;
 		}
 	}
+
+	*argc_p = argc;
 }
 
 static void
@@ -4563,8 +4588,7 @@ recommend_man_page(int cmd, FILE *fp)
 	format_str = T("Some uncommon options are not listed;\n"
 		       "See %"TS".pdf in the doc directory for more details.\n");
 #else
-	format_str = T("Some uncommon options are not listed;\n"
-		       "Try `man %"TS"' for more details.\n");
+	format_str = T("Some uncommon options are not listed; see `man %"TS"' for more details.\n");
 #endif
 	tfprintf(fp, format_str, get_cmd_string(cmd, true));
 }
@@ -4586,7 +4610,7 @@ usage_all(FILE *fp)
 		print_usage_string(cmd, fp);
 		tfprintf(fp, T("\n"));
 	}
-	static const tchar *extra =
+	static const tchar * const extra =
 	T(
 "    %"TS" --help\n"
 "    %"TS" --version\n"
@@ -4672,11 +4696,8 @@ main(int argc, tchar **argv)
 		}
 	}
 
-	/* Handle --help and --version.  --help can be either for the program as
-	 * a whole (cmd == CMD_NONE) or just for a specific command (cmd !=
-	 * CMD_NONE).  Note: help_or_version() will not return if a --help or
-	 * --version argument was found.  */
-	help_or_version(argc, argv, cmd);
+	/* Handle common options.  May exit early (for --help or --version).  */
+	do_common_options(&argc, argv, cmd);
 
 	/* Bail if a valid command was not specified.  */
 	if (cmd == CMD_NONE) {