Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-21 08:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Provide str_sysconfig()

Browse Source
This commit is contained in:
stefanrueger
2026-07-31 23:35:31 +02:00
parent 287b1ac042
commit 5a20f08289
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libavrdude.h
View File

@@ -1782,6 +1782,7 @@ extern "C" {
char *str_vectorname(const Avrintel *up, int vn);
int pgmid_is(const char *str);
char *mmt_realpath(const char *);
char *str_sysconfig(void);
int led_set(const PROGRAMMER *pgm, int led);
int led_clr(const PROGRAMMER *pgm, int led);

42
src/strutil.c
View File

@@ -19,6 +19,7 @@
#include <ac_cfg.h>
#include <whereami.h>
#include <string.h>
#include <errno.h>
#include <stdio.h>
@@ -1742,3 +1743,44 @@ char *mmt_realpath(const char *file) {
char path[PATH_MAX + 1] = { 0 };
return realpath(file, path) && access(path, F_OK) == 0? mmt_strdup(path): NULL;
}
/*
* Return mmt_malloc'd location of system configuration file in this order:
* 1. <dirpath of executable>/../etc/avrdude.conf
* 2. <dirpath of executable>/avrdude.conf
* 3. First avrdude.conf in PATH (Windows) or CONFIG_DIR/avrdude.conf (elsewhere)
*/
char *str_sysconfig(void) {
char *ret, config[PATH_MAX + 1 + sizeof( CONFIG_DIR "/../etc/" SYSTEM_CONF_FILE)] = { 0 };
int dirpath_len = 0;
int abspath_len = wai_getExecutablePath(config, PATH_MAX, &dirpath_len);
if(abspath_len > 0 && dirpath_len > 0) {
config[dirpath_len] = 0;
for(char *p = config; *p; p++) // Replace backslashes with forward slashes
if(*p == '\\')
*p = '/';
msg_trace2("dirpath = %s\n", config);
}
if(*config) {
// 1. Check <dirpath of executable>/../etc/avrdude.conf
strcat(config, "/../etc/" SYSTEM_CONF_FILE);
if((ret = mmt_realpath(config)))
return ret;
// 2. Check <dirpath of executable>/avrdude.conf
config[dirpath_len] = 0;
strcat(config, "/" SYSTEM_CONF_FILE);
if((ret = mmt_realpath(config)))
return ret;
}
// 3. Check CONFIG_DIR/avrdude.conf
#if defined(WIN32)
win_set_path(config, sizeof config, SYSTEM_CONF_FILE);
return mmt_realpath(config);
#else
return mmt_realpath(CONFIG_DIR "/" SYSTEM_CONF_FILE);
#endif
}