From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 2 Feb 2018 15:32:43 +0000 (-0600)
Subject: mkfs: always explain why numeric inputs are invalid
X-Git-Tag: v4.15.0-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d25f65f268565c07ef094ff7d25fb5a36cd3b9d;p=thirdparty%2Fxfsprogs-dev.git

mkfs: always explain why numeric inputs are invalid

Always explain why invalid numeric inputs are not valid, and in a
complete sentence since that's what illegal_optio() sets us up for.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 6285b247f..f527476f5 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1269,7 +1269,7 @@ illegal_option(
 	fprintf(stderr,
 		_("Invalid value %s for -%c %s option. %s\n"),
 		value, opts->name, opts->subopts[index],
-		reason ? reason : "");
+		reason);
 	usage();
 }
 
@@ -1360,18 +1360,20 @@ getnum(
 
 		c = strtoll(str, &str_end, 0);
 		if (c == 0 && str_end == str)
-			illegal_option(str, opts, index, NULL);
+			illegal_option(str, opts, index,
+					_("Value not recognized as number."));
 		if (*str_end != '\0')
-			illegal_option(str, opts, index, NULL);
+			illegal_option(str, opts, index,
+					_("Unit suffixes are not allowed."));
 	}
 
 	/* Validity check the result. */
 	if (c < sp->minval)
-		illegal_option(str, opts, index, _("value is too small"));
+		illegal_option(str, opts, index, _("Value is too small."));
 	else if (c > sp->maxval)
-		illegal_option(str, opts, index, _("value is too large"));
+		illegal_option(str, opts, index, _("Value is too large."));
 	if (sp->is_power_2 && !ispow2(c))
-		illegal_option(str, opts, index, _("value must be a power of 2"));
+		illegal_option(str, opts, index, _("Value must be a power of 2."));
 	return c;
 }