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

Merge pull request #2181 from stefanrueger/usr-config-windows

Browse Source 
Harden `str_usrconfig()` and `str_sysconfig()`
This commit is contained in:
Stefan Rueger
2026-08-12 20:51:12 +02:00
committed by GitHub
parent bf86b97b8f 8cde7a2df6
commit e4fc4609cb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -955,7 +955,7 @@ int main(int argc, char *argv[]) {
if(!no_avrduderc) {
char *usrconfig = str_usrconfig();
pmsg_notice("user configuration file is %s\n", usrconfig? usrconfig: "not provided");
pmsg_notice("user configuration file is %s\n", usrconfig? usrconfig: "not provided/readable");
if(usrconfig && read_config(usrconfig)) {
pmsg_error("unable to process user configuration file %s\n", usrconfig);
exit(1);

13
src/strutil.c
View File

@@ -1776,8 +1776,7 @@ char *str_sysconfig(void) {
}
#if defined(WIN32)
// 3. First config file in PATH
win_set_path(config, sizeof config, SYSTEM_CONF_FILE);
return mmt_realpath(config);
return win_set_path(config, sizeof config, SYSTEM_CONF_FILE)? mmt_realpath(config): NULL;
#else
// 3. Check CONFIG_DIR/avrdude.conf
return mmt_realpath(CONFIG_DIR "/" SYSTEM_CONF_FILE);
@@ -1809,21 +1808,23 @@ static char *concatpath(char *dst, char *dir, char *file, size_t n) {
}
#endif
// Return mmt_malloc'd location of personal configuration file or NULL if not there
// Return mmt_malloc'd location of readable personal configuration file or NULL if not there
char *str_usrconfig(void) {
char config[PATH_MAX] = { 0 };
struct stat sb;
#if defined(WIN32)
win_set_path(config, sizeof config, USER_CONF_FILE);
if(!win_set_path(config, sizeof config, USER_CONF_FILE))
memset(config, 0, sizeof config);
#else
if(!concatpath(config, getenv("XDG_CONFIG_HOME"), XDG_USER_CONF_FILE, sizeof config))
concatpath(config, getenv("HOME"), ".config/" XDG_USER_CONF_FILE, sizeof config);
if(stat(config, &sb) < 0 || (sb.st_mode & S_IFREG) == 0)
if(stat(config, &sb) < 0 || (sb.st_mode & S_IFREG) == 0 || access(config, R_OK) < 0)
concatpath(config, getenv("HOME"), USER_CONF_FILE, sizeof config);
#endif
return mmt_realpath(config);
return *config && stat(config, &sb) == 0 && (sb.st_mode & S_IFREG) && access(config, R_OK) == 0?
mmt_realpath(config): NULL;
}
// Replace initial part of string with ~ if it is the home directory