From: Alexander Couzens Date: Sat, 11 Jun 2016 02:12:38 +0000 (+0200) Subject: tools/mkfwimage2: remove 256 length limit for partition images X-Git-Tag: v17.01.0-rc1~2374 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5a5934f0c2ca51b5354370e97bb8662e75041756;p=oweals%2Fopenwrt.git tools/mkfwimage2: remove 256 length limit for partition images Signed-off-by: Alexander Couzens --- diff --git a/tools/firmware-utils/src/mkfwimage2.c b/tools/firmware-utils/src/mkfwimage2.c index 146b2ad55d..89a98051b4 100644 --- a/tools/firmware-utils/src/mkfwimage2.c +++ b/tools/firmware-utils/src/mkfwimage2.c @@ -197,6 +197,10 @@ int str2u32(char *arg, u_int32_t *val) return 0; } +#ifndef STRINGIFY +#define STRINGIFY2(X) #X +#define STRINGIFY(X) STRINGIFY2(X) +#endif static int image_layout_add_partition(const char *part_desc) { part_data_t *d; @@ -212,7 +216,7 @@ static int image_layout_add_partition(const char *part_desc) } d = &im.parts[im.part_count]; - t = sscanf(part_desc, "%15[-0-9a-zA-Z]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%256s", + t = sscanf(part_desc, "%15[-0-9a-zA-Z]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%"STRINGIFY(PATH_MAX)"s", d->partition_name, offset, length,