Convert TNF licenses to new 2 clause variant

[bsd-progress.git] / strsuftoll.c

diff --git a/strsuftoll.c b/strsuftoll.c
index d52ff53dc08a31f72671123fadc2c7dca6e60987..0e29a6d62722a58dc9864b112f650f8a38964d7a 100644 (file)
--- a/strsuftoll.c
+++ b/strsuftoll.c
@@ -1,6 +1,6 @@
-/*     $NetBSD: strsuftoll.c,v 1.5 2004/01/17 23:02:51 dbj Exp $       */
+/*     $NetBSD: strsuftoll.c,v 1.8 2008/04/28 20:23:00 martin Exp $    */
 /*-
- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -14,13 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -74,7 +67,7 @@
 #include <sys/cdefs.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strsuftoll.c,v 1.5 2004/01/17 23:02:51 dbj Exp $");
+__RCSID("$NetBSD: strsuftoll.c,v 1.8 2008/04/28 20:23:00 martin Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef _LIBC
@@ -108,8 +101,10 @@ __weak_alias(strsuftollx, _strsuftollx)
  *     2) A positive decimal number followed by a b (mult by 512).
  *     3) A positive decimal number followed by a k (mult by 1024).
  *     4) A positive decimal number followed by a m (mult by 1048576).
- *     5) A positive decimal number followed by a w (mult by sizeof int)
- *     6) Two or more positive decimal numbers (with/without k,b or w).
+ *     5) A positive decimal number followed by a g (mult by 1073741824).
+ *     6) A positive decimal number followed by a t (mult by 1099511627776).
+ *     7) A positive decimal number followed by a w (mult by sizeof int)
+ *     8) Two or more positive decimal numbers (with/without k,b or w).
  *        separated by x (also * for backwards compatibility), specifying
  *        the product of the indicated values.
  * Returns the result upon successful conversion, or exits with an
@@ -152,7 +147,7 @@ strsuftollx(const char *desc, const char *val,
        while (isspace((unsigned char)*val))    /* Skip leading space */
                val++;
 
-       num = strtoll(val, &expr, 0);
+       num = strtoll(val, &expr, 10);
        if (errno == ERANGE)
                goto erange;                    /* Overflow */
 
@@ -169,28 +164,28 @@ strsuftollx(const char *desc, const char *val,
                break;
        case 'k':
                t = num;
-               num *= 1024;                    /* 1 kilobyte */
+               num *= 1024;                    /* 1 kibibyte */
                if (t > num)
                        goto erange;
                ++expr;
                break;
        case 'm':
                t = num;
-               num *= 1048576;                 /* 1 megabyte */
+               num *= 1048576;                 /* 1 mebibyte */
                if (t > num)
                        goto erange;
                ++expr;
                break;
        case 'g':
                t = num;
-               num *= 1073741824;              /* 1 gigabyte */
+               num *= 1073741824;              /* 1 gibibyte */
                if (t > num)
                        goto erange;
                ++expr;
                break;
        case 't':
                t = num;
-               num *= 1099511627776LL;         /* 1 terabyte */
+               num *= 1099511627776LL;         /* 1 tebibyte */
                if (t > num)
                        goto erange;
                ++expr;