avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-13 17:34:56 +00:00
Code Issues Projects Releases Wiki Activity

patch #7699 Read additional config files

Browse Source 
* main.c: Added reading of additional config files
* avrdude.1: updated man page
* doc/avrdude.texi: updated documentation


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@1038 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Rene Liebscher
2012-01-10 18:07:19 +00:00
parent c6518e2a1c
commit 33a0f421cf
4 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
avrdude/main.c
View File

@@ -75,6 +75,8 @@ static LISTID updates;
static LISTID extended_params;
static LISTID additional_config_files;
static PROGRAMMER * pgm;
/*
@@ -342,6 +344,12 @@ int main(int argc, char * argv [])
exit(1);
}
additional_config_files = lcreat(NULL, 0);
if (additional_config_files == NULL) {
fprintf(stderr, "%s: cannot initialize additional config files list\n", progname);
exit(1);
}
partdesc = NULL;
port = default_parallel;
erase = 0;
@@ -448,8 +456,12 @@ int main(int argc, char * argv [])
break;
case 'C': /* system wide configuration file */
strncpy(sys_config, optarg, PATH_MAX);
sys_config[PATH_MAX-1] = 0;
if (optarg[0] == '+') {
ladd(additional_config_files, optarg+1);
} else {
strncpy(sys_config, optarg, PATH_MAX);
sys_config[PATH_MAX-1] = 0;
}
break;
case 'D': /* disable auto erase */
@@ -620,6 +632,28 @@ int main(int argc, char * argv [])
}
}
}
if (lsize(additional_config_files) > 0) {
LNODEID ln1;
const char * p = NULL;
for (ln1=lfirst(additional_config_files); ln1; ln1=lnext(ln1)) {
p = ldata(ln1);
if (verbose) {
fprintf(stderr, "%sAdditional configuration file is \"%s\"\n",
progbuf, p);
}
rc = read_config(p);
if (rc) {
fprintf(stderr,
"%s: error reading additional configuration file \"%s\"\n",
progname, p);
exit(1);
}
}
}
// set bitclock from configuration files unless changed by command line
if (default_bitclock > 0 && bitclock == 0.0) {
bitclock = default_bitclock;