From 4c4952d4f630a1c82c6b800eabea5c015c11aa5d Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Thu, 10 Nov 2022 18:20:13 +0000
Subject: [PATCH] Ensure default_programmer from config files is used
---
src/main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index 23ef5aef..642c0310 100644
--- a/src/main.c
+++ b/src/main.c
@@ -482,7 +482,7 @@ int main(int argc, char * argv [])
char * port; /* device port (/dev/xxx) */
int terminal; /* 1=enter terminal mode, 0=don't */
const char *exitspecs; /* exit specs string from command line */
- char * programmer; /* programmer id */
+ const char *programmer; /* programmer id */
char sys_config[PATH_MAX]; /* system wide config file */
char usr_config[PATH_MAX]; /* per-user config file */
char executable_abspath[PATH_MAX]; /* absolute path to avrdude executable */
@@ -568,7 +568,7 @@ int main(int argc, char * argv [])
quell_progress = 0;
exitspecs = NULL;
pgm = NULL;
- programmer = cfg_strdup("main()", default_programmer);
+ programmer = "";
verbose = 0;
baudrate = 0;
bitclock = 0.0;
@@ -954,6 +954,9 @@ int main(int argc, char * argv [])
bitclock = default_bitclock;
}
+ if(!(programmer && *programmer) && *default_programmer)
+ programmer = cache_string(default_programmer);
+
// Developer options to print parts and/or programmer entries of avrdude.conf
int dev_opt_c = dev_opt(programmer); // -c <wildcard>/[sSArt]
int dev_opt_p = dev_opt(partdesc); // -p <wildcard>/[dsSArcow*t]