[flashrom] [commit] r1030 - trunk
repository service
svn at flashrom.org
Fri Jun 4 19:07:39 CEST 2010
Author: uwe
Date: Fri Jun 4 19:07:39 2010
New Revision: 1030
URL: http://flashrom.org/trac/coreboot/changeset/1030
Log:
Make the 'flashrom --help' output look a bit nicer.
Only print "flashrom" as the program name unconditionally, not the full path
and program name (e.g. "/home/foo/bar/baz/flashrom" or on Windows
"C:\Foo\Bar\Whatever\flashrom.exe"). The path or exact executable name is
not really useful to print here, if you managed to run --help you already
know it, and it just makes the output look ugly.
Also, add a missing newline to make the output look nicer.
Finally, revert the "CONFIG_PRINT_WIKI ?= yes" change which accidentally
slipped into r1029.
Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Modified:
trunk/Makefile
trunk/cli_classic.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Fri Jun 4 18:39:35 2010 (r1029)
+++ trunk/Makefile Fri Jun 4 19:07:39 2010 (r1030)
@@ -120,7 +120,7 @@
CONFIG_DEDIPROG ?= no
# Disable wiki printing by default. It is only useful if you have wiki access.
-CONFIG_PRINT_WIKI ?= yes
+CONFIG_PRINT_WIKI ?= no
ifeq ($(CONFIG_INTERNAL), yes)
FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1'
Modified: trunk/cli_classic.c
==============================================================================
--- trunk/cli_classic.c Fri Jun 4 18:39:35 2010 (r1029)
+++ trunk/cli_classic.c Fri Jun 4 19:07:39 2010 (r1030)
@@ -38,14 +38,13 @@
int remaining = 0;
enum programmer p;
- printf("Usage: %s [-n] [-V] [-f] [-h|-R|-L|"
+ printf("Usage: flashrom [-n] [-V] [-f] [-h|-R|-L|"
#if CONFIG_PRINT_WIKI == 1
"-z|"
#endif
"-E|-r <file>|-w <file>|-v <file>]\n"
" [-c <chipname>] [-m [<vendor>:]<part>] [-l <file>]\n"
- " [-i <image>] [-p <programmername>[:<parameters>]]\n",
- name);
+ " [-i <image>] [-p <programmername>[:<parameters>]]\n\n");
printf("Please note that the command line interface for flashrom has "
"changed between\n"
@@ -119,9 +118,9 @@
"flash chips.\n\n");
}
-void cli_classic_abort_usage(const char *name)
+void cli_classic_abort_usage(void)
{
- printf("Please run \"%s --help\" for usage info.\n", name);
+ printf("Please run \"flashrom --help\" for usage info.\n");
exit(1);
}
@@ -185,7 +184,7 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
filename = strdup(optarg);
read_it = 1;
@@ -194,7 +193,7 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
filename = strdup(optarg);
write_it = 1;
@@ -204,12 +203,12 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
if (dont_verify_it) {
fprintf(stderr, "--verify and --noverify are"
"mutually exclusive. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
filename = strdup(optarg);
verify_it = 1;
@@ -218,7 +217,7 @@
if (verify_it) {
fprintf(stderr, "--verify and --noverify are"
"mutually exclusive. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
dont_verify_it = 1;
break;
@@ -232,7 +231,7 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
erase_it = 1;
break;
@@ -244,7 +243,7 @@
fprintf(stderr, "Error: Internal programmer support "
"was not compiled in and --mainboard only\n"
"applies to the internal programmer. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
#endif
break;
case 'f':
@@ -253,7 +252,7 @@
case 'l':
tempstr = strdup(optarg);
if (read_romlayout(tempstr))
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
break;
case 'i':
tempstr = strdup(optarg);
@@ -263,7 +262,7 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
list_supported = 1;
break;
@@ -272,13 +271,13 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
list_supported_wiki = 1;
#else
fprintf(stderr, "Error: Wiki output was not compiled "
"in. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
#endif
break;
case 'p':
@@ -310,7 +309,7 @@
if (programmer == PROGRAMMER_INVALID) {
fprintf(stderr, "Error: Unknown programmer "
"%s.\n", optarg);
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
break;
case 'R':
@@ -318,7 +317,7 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
exit(0);
break;
@@ -326,13 +325,13 @@
if (++operation_specified > 1) {
fprintf(stderr, "More than one operation "
"specified. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
cli_classic_usage(argv[0]);
exit(0);
break;
default:
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
break;
}
}
@@ -353,14 +352,14 @@
if (optind < argc) {
fprintf(stderr, "Error: Extra parameter found.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
#if CONFIG_INTERNAL == 1
if ((programmer != PROGRAMMER_INTERNAL) && (lb_part || lb_vendor)) {
fprintf(stderr, "Error: --mainboard requires the internal "
"programmer. Aborting.\n");
- cli_classic_abort_usage(argv[0]);
+ cli_classic_abort_usage();
}
#endif
More information about the flashrom
mailing list