summaryrefslogtreecommitdiff
path: root/cli_classic.c
diff options
context:
space:
mode:
authorstefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-06-02 00:12:23 +0000
committerstefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-06-02 00:12:23 +0000
commitc4846dd44dbf64532b877f96d6968a2a655523d2 (patch)
tree2024a49710df58beb390dd05b425bf1b686a3eb8 /cli_classic.c
parent6cee1655272569e8eafc046bb048026f43a920b5 (diff)
downloadflashrom-c4846dd44dbf64532b877f96d6968a2a655523d2.tar.gz
Add default arguments for the default programmer (only).
This code exists thanks to food for thought from Urja Rannikko. Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1814 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'cli_classic.c')
-rw-r--r--cli_classic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cli_classic.c b/cli_classic.c
index a32d55b..fc1b9ba 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -396,8 +396,10 @@ int main(int argc, char *argv[])
if (prog == PROGRAMMER_INVALID) {
if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) {
prog = CONFIG_DEFAULT_PROGRAMMER;
- msg_pinfo("Using default programmer \"%s\".\n",
- programmer_table[CONFIG_DEFAULT_PROGRAMMER].name);
+ /* We need to strdup here because we free(pparam) unconditionally later. */
+ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS);
+ msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n",
+ programmer_table[CONFIG_DEFAULT_PROGRAMMER].name, pparam);
} else {
msg_perr("Please select a programmer with the --programmer parameter.\n"
"Previously this was not necessary because there was a default set.\n"