From 8b395ee11e3498950e356f3149086bc192bc5cbe Mon Sep 17 00:00:00 2001 From: ae Date: Fri, 19 Aug 2011 12:48:06 +0000 Subject: The decimal() function was changed in r217808 to take the maximum value instead of number of bits. But for case when limitation is not needed it erroneously skips conversion to number and always returns zero. So, don't skip conversion for case when limitation is not needed. PR: bin/159765 Approved by: re (kib) --- sbin/fdisk/fdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sbin/fdisk') diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index eb81e3b..ba1ee00 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -940,7 +940,7 @@ decimal(const char *str, int *num, int deflt, uint32_t maxval) return 0; while ((c = *cp++)) { if (c <= '9' && c >= '0') { - if (maxval > 0 && acc <= maxval) + if (acc <= maxval || maxval == 0) acc = acc * 10 + c - '0'; } else break; -- cgit v1.1