From cf2d62f84a09f6b98062bd87628d8f4c4879f55e Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Thu, 6 Feb 2003 16:47:06 +0000 Subject: [PATCH] ntfsresize patch from Szaka to allow binary prefixes. (Logical change 1.115) --- ntfsprogs/ntfsresize.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c index f15d1fc8..4ebb7fe4 100644 --- a/ntfsprogs/ntfsresize.c +++ b/ntfsprogs/ntfsresize.c @@ -258,6 +258,7 @@ s64 get_new_volume_size(char *s) { s64 size; char *suffix; + int prefix_kind = 1000; size = strtoll(s, &suffix, 10); if (size <= 0 || errno == ERANGE) @@ -266,7 +267,9 @@ s64 get_new_volume_size(char *s) if (!*suffix) return size; - if (strlen(suffix) > 1) + if (strlen(suffix) == 2 && suffix[1] == 'i') + prefix_kind = 1024; + else if (strlen(suffix) > 1) usage(); /* We follow the SI prefixes: @@ -284,11 +287,11 @@ s64 get_new_volume_size(char *s) /* FIXME: check for overflow */ switch (*suffix) { case 'G': - size *= 1000; + size *= prefix_kind; case 'M': - size *= 1000; + size *= prefix_kind; case 'k': - size *= 1000; + size *= prefix_kind; break; default: usage();