Try to make indent formatting less horrible

[oweals/busybox.git] / libbb / parse_number.c

diff --git a/libbb/parse_number.c b/libbb/parse_number.c
index 755a357adc8a1ae3eca3f8d5c577b657490a605e..92ad6a21647f2cdd6f6d85d63ce423e3e4a7431f 100644 (file)
--- a/libbb/parse_number.c
+++ b/libbb/parse_number.c
@@ -1,70 +1,64 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Utility routines.
+ * bb_xparse_number implementation for busybox
  *
- * Copyright (C) many different people.  If you wrote this, please
- * acknowledge your work.
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <assert.h>
 #include "libbb.h"
 
-
-unsigned long parse_number(const char *numstr,
-               const struct suffix_mult *suffixes)
+extern
+unsigned long bb_xparse_number(const char *numstr,
+                                                          const struct suffix_mult *suffixes)
 {
-       const struct suffix_mult *sm;
-       unsigned long int ret;
-       int len;
-       char *end;
+       unsigned long int r;
+       char *e;
+       int old_errno;
        
-       ret = strtoul(numstr, &end, 10);
-       if (numstr == end)
-               error_msg_and_die("invalid number `%s'", numstr);
-       while (end[0] != '\0') {
-               sm = suffixes;
-               while ( sm != 0 ) {
-                       if(sm->suffix) {
-                               len = strlen(sm->suffix);
-                               if (strncmp(sm->suffix, end, len) == 0) {
-                                       ret *= sm->mult;
-                                       end += len;
-                                       break;
+       /* Since this is a lib function, we're not allowed to reset errno to 0.
+        * Doing so could break an app that is deferring checking of errno.
+        * So, save the old value so that we can restore it if successful. */
+       old_errno = errno;
+       errno = 0;
+       r = strtoul(numstr, &e, 10);
+
+       if ((numstr != e) && !errno) {
+               errno = old_errno;      /* Ok.  So restore errno. */
+               if (!*e) {
+                       return r;
+               }
+               if (suffixes) {
+                       assert(suffixes->suffix);       /* No nul suffixes. */
+                       do {
+                               if (strcmp(suffixes->suffix, e) == 0) {
+                                       if (ULONG_MAX / suffixes->mult < r) {   /* Overflow! */
+                                               break;
+                                       }
+                                       return r * suffixes->mult;
                                }
-                       sm++;
-                       
-                       } else
-                               sm = 0;
+                               ++suffixes;
+                       } while (suffixes->suffix);
                }
-               if (sm == 0)
-                       error_msg_and_die("invalid number `%s'", numstr);
        }
-       return ret;
+       bb_error_msg_and_die("invalid number `%s'", numstr);
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/