From: Rafał Miłecki <rafal@xxxxxxxxxx>
FT is sometimes used for storing raw data. That is quite common for
U-Boot FIT images.
Extracting such data is not trivial currently. Using type 's' (string)
will replace every 0x00 (NUL) with 0x20 (space). Using type 'x' will
print bytes but in xxd incompatible format.
This commit adds support for 'b' (binary) format. Example usage:
fdtget -t b firmware.itb /images/foo data > image.raw
Signed-off-by: Rafał Miłecki <rafal@xxxxxxxxxx>
---
fdtget.c | 5 +++++
util.c | 24 ++++++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/fdtget.c b/fdtget.c
index 54fc6a0..6e4abf1 100644
--- a/fdtget.c
+++ b/fdtget.c
@@ -97,6 +97,11 @@ static int show_data(struct display_info *disp, const char *data, int len)
if (len == 0)
return 0;
+ if (disp->type == 'b') {
+ fwrite(data, 1, len, stdout);
+ return 0;
+ }
+
is_string = (disp->type) == 's' ||
(!disp->type && util_is_printable_string(data, len));
if (is_string) {
diff --git a/util.c b/util.c
index 40274fb..4fa76c5 100644
--- a/util.c
+++ b/util.c
@@ -340,24 +340,28 @@ int utilfdt_decode_type(const char *fmt, int *type, int *size)
/* get the conversion qualifier */
*size = -1;
- if (strchr("hlLb", *fmt)) {
- qualifier = *fmt++;
- if (qualifier == *fmt) {
- switch (*fmt++) {
-/* TODO: case 'l': qualifier = 'L'; break;*/
- case 'h':
+ for (; *(fmt + 1); fmt++) {
+ if (!strchr("hlLb", *fmt))
+ return -1;
+ if (qualifier) {
+ if (*fmt == 'h' && qualifier == 'h')
qualifier = 'b';
- break;
- }
+ else
+ return -1;
+ } else {
+ qualifier = *fmt;
}
}
/* we should now have a type */
- if ((*fmt == '\0') || !strchr("iuxs", *fmt))
+ if (!strchr("iuxsb", *fmt)) {
+ if (*fmt)
+ fprintf(stderr, "invalid type: %c\n", *fmt);
return -1;
+ }
/* convert qualifier (bhL) to byte size */
- if (*fmt != 's')
+ if (*fmt != 's' && *fmt != 'b')
*size = qualifier == 'b' ? 1 :
qualifier == 'h' ? 2 :
qualifier == 'l' ? 4 : -1;
--
2.31.1
