emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ubi_tools: enhance -s option to allow size multiplier to match mtd-utils

Browse Source 
Based on patch by Paul B. Henson <henson@acm.org>

function                                             old     new   delta
static.size_suffixes                                   -      32     +32
ubi_tools_main                                      1141    1148      +7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-06-30 02:47:45 +02:00
parent f798ba9717
commit e9b3fcc3e4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
miscutils/ubi_tools.c
View File

@ -92,6 +92,13 @@ static unsigned get_num_from_file(const char *path, unsigned max, const char *er
int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
{
static const struct suffix_mult size_suffixes[] = {
{ "KiB", 1024 },
{ "MiB", 1024*1024 },
{ "GiB", 1024*1024*1024 },
{ "", 0 }
};
unsigned opts;
char *ubi_ctrl;
int fd;
@ -140,7 +147,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
#define OPTION_t (1 << 6)
if (opts & OPTION_s)
size_bytes = xatoull(size_bytes_str);
size_bytes = xatoull_sfx(size_bytes_str, size_suffixes);
argv += optind;
ubi_ctrl = *argv++;