len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdtput: Use strtol() in preference to sscanf()

Browse source 
I find the exact semantics of scanf() always confusing, and mostly we use
strtol() and similar functions instead.  Switch fdtput to using strtol and
similar functions instead of sscanf().

As well as being more in keeping with what we do in other places, this
works around a FreeBSD bug[0], where sscanf(), but not strtol() parses
"003" as having value 0.

[0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288440

Link: https://github.com/dgibson/dtc/issues/165

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2025-07-28 16:42:34 +10:00
parent 5b71660724
commit a0dd7b6081
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
fdtput.c
View file

@ -9,6 +9,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <libfdt.h> #include <libfdt.h>
@ -64,16 +65,12 @@ static int encode_value(struct display_info *disp, char **arg, int arg_count,
int len; /* length of this cell/string/byte */ int len; /* length of this cell/string/byte */
int ival; int ival;
int upto; /* the number of bytes we have written to buf */ int upto; /* the number of bytes we have written to buf */
char fmt[3];
upto = 0; upto = 0;
if (disp->verbose) if (disp->verbose)
fprintf(stderr, "Decoding value:\n"); fprintf(stderr, "Decoding value:\n");
fmt[0] = '%';
fmt[1] = disp->type ? disp->type : 'd';
fmt[2] = '\0';
for (; arg_count > 0; arg++, arg_count--, upto += len) { for (; arg_count > 0; arg++, arg_count--, upto += len) {
/* assume integer unless told otherwise */ /* assume integer unless told otherwise */
if (disp->type == 's') if (disp->type == 's')
@ -94,7 +91,34 @@ static int encode_value(struct display_info *disp, char **arg, int arg_count,
fprintf(stderr, "\tstring: '%s'\n", ptr); fprintf(stderr, "\tstring: '%s'\n", ptr);
} else { } else {
fdt32_t *iptr = (fdt32_t *)ptr; fdt32_t *iptr = (fdt32_t *)ptr;
sscanf(*arg, fmt, &ival); char *endptr;
errno = 0;
switch (disp->type) {
case 'x':
ival = strtoul(*arg, &endptr, 16);
break;
case 'o':
ival = strtoul(*arg, &endptr, 8);
break;
case 'i':
ival = strtol(*arg, &endptr, 0);
break;
case 'u':
ival = strtoul(*arg, &endptr, 0);
break;
default: /* 0 or 'd' */
ival = strtol(*arg, &endptr, 10);
}
if (*endptr != '\0' || errno) {
if (disp->verbose) {
fprintf(stderr,
"Couldn't parse \"%s\" as an integer\n",
*arg);
}
return -1;
}
if (len == 4) if (len == 4)
*iptr = cpu_to_fdt32(ival); *iptr = cpu_to_fdt32(ival);
else else