Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
disk-utils/mkfs.minix.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index b8b4e87..58b16fc 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -680,14 +680,12 @@ int main(int argc, char ** argv) {
case 'c':
check=1; break;
case 'i':
- req_nr_inodes = (unsigned long) atol(optarg);
+ req_nr_inodes = strtoul_or_err(optarg, _("failed to parse argument"));
break;
case 'l':
listfile = optarg; break;
case 'n':
- i = strtoul(optarg,&tmp,0);
- if (*tmp)
- usage();
+ i = strtoul_or_err(optarg, _("failed to parse argument"));
if (i == 14)
magic = MINIX_SUPER_MAGIC;
else if (i == 30)
@@ -719,13 +717,8 @@ int main(int argc, char ** argv) {
argc--;
argv++;
}
- if (argc > 0) {
- BLOCKS = strtol(argv[0],&tmp,0);
- if (*tmp) {
- printf(_("strtol error: number of blocks not specified"));
- usage();
- }
- }
+ if (argc > 0)
+ BLOCKS = strtoul_or_err(argv[0], _("failed to parse number of blocks"));
if (!device_name) {
usage();
--
1.7.12.2
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
