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

Rewrite nexttok() to allow escaped spaces in non-string arguments

Browse Source 
Useful for file names

```
$ echo "Hello, world!" >'Q:\Projects\Eurovision Song Contest\light show.eep'
$ avrdude -qqt
avrdude> erase eeprom 0 16
avrdude> # Escape spaces in filenames with a backslash:
avrdude> write eeprom Q:\Projects\Eurovision\ Song\ Contest\light\ show.eep:r
avrdude> dump eeprom 0 16
0000  48 65 6c 6c 6f 2c 20 77  6f 72 6c 64 21 0a ff ff  |Hello, world! ..|
```
This commit is contained in:
Stefan Rueger
2023-05-15 16:49:08 +01:00
parent 88d4d712df
commit a40b9db5a4
1 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/term.c
View File

@@ -117,43 +117,6 @@ struct command cmd[] = {
static int spi_mode = 0;
static int nexttok(char *buf, char **tok, char **next) {
unsigned char *q, *n;
q = (unsigned char *) buf;
while (isspace(*q))
q++;
/* isolate first token */
n = q;
uint8_t quotes = 0;
while (*n && (!isspace(*n) || quotes)) {
// Poor man's quote and escape processing
if (*n == '"' || *n == '\'')
quotes++;
else if(*n == '\\' && n[1])
n++;
else if (isspace(*n) && (n > q+1) && (n[-1] == '"' || n[-1] == '\''))
break;
n++;
}
if (*n) {
*n = 0;
n++;
}
/* find start of next token */
while (isspace(*n))
n++;
*tok = (char *) q;
*next = (char *) n;
return 0;
}
static int hexdump_line(char *buffer, unsigned char *p, int n, int pad) {
char *hexdata = "0123456789abcdef";
char *b = buffer;
@@ -1078,6 +1041,38 @@ static int cmd_quell(PROGRAMMER *pgm, AVRPART *p, int argc, char *argv[]) {
return 0;
}
static int nexttok(char *buf, char **tok, char **next) {
unsigned char *q, *r, *w, inquote;
q = (unsigned char *) buf;
while (isspace(*q))
q++;
// Isolate first token
for(inquote = 0, w = r = q; *r && !(isspace(*r) && !inquote); *w++ = *r++) {
// Poor man's quote and escape processing
if(*r == '"' || *r == '\'')
inquote = inquote && *r == inquote? 0: inquote? inquote: *r;
else if(*r == '\\' && isspace(r[1])) // Remove \ before space for file names
r++;
else if(*r == '\\' && r[1]) // Leave other \ to keep C-style, eg, '\n'
*w++ = *r++;
}
if(*r)
r++;
*w = 0;
// Find start of next token
while (isspace(*r))
r++;
*tok = (char *) q;
*next = (char *) r;
return 0;
}
static int tokenize(char *s, char ***argv) {
int i, n, l, nargs;
int len, slen;