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 #2173 from stefanrueger/modify

Browse Source 
Enforce modify cannot be used in system config file
This commit is contained in:
Stefan Rueger
2026-08-03 18:38:27 +02:00
committed by GitHub
parent 23f4caed60 012ffa5474
commit 12f40e07cf
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/config_gram.y
View File

@@ -48,6 +48,7 @@ static int assign_pin(int pinfunc, TOKEN *v, int invert);
static int assign_pin_list(int invert);
static int which_opcode(TOKEN *opcode);
static int parse_cmdbits(OPCODE *op, int opnum);
static int in_systemconfig(void);
#define pin_name (cx->cfgy_pin_name)
%}
@@ -323,6 +324,10 @@ prog_decl :
prog_modify:
K_MODIFY K_PROGRAMMER TKN_STRING {
if(in_systemconfig()) {
free_token($3);
YYABORT;
}
current_prog = locate_programmer(programmers, $3->value.string);
if(!current_prog) {
yyerror("to be modified programmer %s not found", $3->value.string);
@@ -452,6 +457,10 @@ part_decl :
part_modify:
K_MODIFY K_PART TKN_STRING {
if(in_systemconfig()) {
free_token($3);
YYABORT;
}
current_part = locate_part(part_list, $3->value.string);
if(!current_part) {
yyerror("to be modified part %s not found", $3->value.string);
@@ -1376,3 +1385,13 @@ static int parse_cmdbits(OPCODE *op, int opnum) {
return rv;
}
static int in_systemconfig(void) {
char *sysconfig = str_sysconfig();
int ret = !cfg_infile || str_eq(cfg_infile, sysconfig);
mmt_free(sysconfig);
if(ret)
yyerror("modify operation %s configuration file", !cfg_infile? "without obvious": "not allowd in system");
return ret;
}

4
src/doc/avrdude.texi
View File

@@ -3843,7 +3843,7 @@ modify programmer <id>
The @code{modify} keyword makes most sense in the per-user configuration
file, where users may want to add specific properties of their programmer.
This could be its USB serial number or default port, eg, a serialadapter
such as @code{"ch340"}. This technique should not be used for the main
such as @code{"ch340"}. This technique must not be used in the system
@code{avrdude.conf} file, as the developer option @code{-c <programmer>/S}
that prints the programmer definition as AVRDUDE understands it will only
consider the final definition; it will not print @code{modify} statements.
@@ -4130,7 +4130,7 @@ modify part <id>
@noindent
The @code{modify} keyword makes most sense in the per-user configuration
file, where users may want to modify specific properties of a part for
debugging. This technique should not be used within the main
debugging. This technique must not be used in the system
@code{avrdude.conf} file, as the developer option @code{-p <part>/S} that
prints the part definition as AVRDUDE understands it will only consider
the final definition; it will not print @code{modify} statements.