*/
/*
- * Copyright (C) 2012-2016 Eric Biggers
+ * Copyright (C) 2012-2017 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
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;
}
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;
" [--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(
),
[CMD_DIR] =
T(
-" %"TS" WIMFILE IMAGE [--path=PATH] [--detailed]\n"
+" %"TS" WIMFILE [IMAGE] [--path=PATH] [--detailed]\n"
),
[CMD_EXPORT] =
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;
}
static const tchar * const s =
T(
"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n"
-"Copyright (C) 2012-2016 Eric Biggers\n"
+"Copyright (C) 2012-2017 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"
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));
}