new files for the large file support number parsing

diff --git a/lib/strtoofft.c b/lib/strtoofft.c
new file mode 100644 (file)
index 0000000..a8e6fa1
--- /dev/null
+++ b/lib/strtoofft.c
@@ -0,0 +1,153 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#include "setup.h"
+#include "strtoofft.h"
+
+#ifdef NEED_CURL_STRTOLL
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+static int get_char(char c, int base);
+
+/**
+ * Emulated version of the strtoll function.  This extracts a long long
+ * value from the given input string and returns it.
+ */
+long long
+Curl_strtoll(const char *nptr, char **endptr, int base)
+{
+  char *end;
+  int is_negative = 0;
+  int overflow;
+  int i;
+  long long value = 0;
+  long long newval;
+
+  /* Skip leading whitespace. */
+  end = (char *)nptr;
+  while (isspace((int)end[0])) {
+    end++;
+  }
+
+  /* Handle the sign, if any. */
+  if (end[0] == '-') {
+    is_negative = 1;
+    end++;
+  } else if (end[0] == '+') {
+    end++;
+  } else if (end[0] == '\0') {
+    /* We had nothing but perhaps some whitespace -- there was no number. */
+    if (endptr) {
+      *endptr = end;
+    }
+    return 0;
+  }
+
+  /* Handle special beginnings, if present and allowed. */
+  if (end[0] == '0' && end[1] == 'x') {
+    if (base == 16 || base == 0) {
+      end += 2;
+      base = 16;
+    }
+  } else if (end[0] == '0') {
+    if (base == 8 || base == 0) {
+      end++;
+      base = 8;
+    }
+  }
+
+  /* Matching strtol, if the base is 0 and it doesn't look like
+   * the number is octal or hex, we assume it's base 10.
+   */
+  if (base == 0) {
+    base = 10;
+  }
+
+  /* Loop handling digits. */
+  value = 0;
+  overflow = 0;
+  for (i = get_char(end[0], base);
+       i != -1;
+       end++, i = get_char(end[0], base))
+  {
+    newval = base * value + i;
+    if (newval < value) {
+      /* We've overflowed. */
+      overflow = 1;
+      break;
+    } else {
+      value = newval;
+    }
+  }
+
+  if (!overflow) {
+    if (is_negative) {
+      /* Fix the sign. */
+      value *= -1;
+    }
+  } else {
+    if (is_negative) {
+      value = 0x8000000000000000L;
+    } else {
+      value = 0x7FFFFFFFFFFFFFFFL;
+    }
+
+    errno = ERANGE;
+  }
+
+  if (endptr) {
+    *endptr = end;
+  }
+
+  return value;
+}
+
+/**
+ * Returns the value of c in the given base, or -1 if c cannot
+ * be interpreted properly in that base (i.e., is out of range,
+ * is a null, etc.).
+ *
+ * @param c     the character to interpret according to base
+ * @param base  the base in which to interpret c
+ *
+ * @return  the value of c in base, or -1 if c isn't in range
+ */
+static int get_char(char c, int base) {
+    int value = -1;
+    if (c <= '9' && c >= '0') {
+       value = c - '0';
+    } else if (c <= 'Z' && c >= 'A') {
+       value = c - 'A' + 10;
+    } else if (c <= 'z' && c >= 'a') {
+       value = c - 'a' + 10;
+    }
+
+    if (value >= base) {
+       value = -1;
+    }
+
+    return value;
+}
+#endif  /* Only present if we need strtoll, but don't have it. */

diff --git a/lib/strtoofft.h b/lib/strtoofft.h
new file mode 100644 (file)
index 0000000..f335b11
--- /dev/null
+++ b/lib/strtoofft.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#ifndef _CURL_STRTOOFFT_R_H
+#define _CURL_STRTOOFFT_R_H
+
+#include "setup.h"
+#include <stddef.h>
+
+/* Determine what type of file offset conversion handling we wish
+ * to use.  For systems with a 32-bit off_t type, we should use
+ * strtol.  For systems with a 64-bit off_t type, we should use
+ * strtoll if it exists, and if not, should try to emulate its
+ * functionality.  At any rate, we define 'strtoofft' such that it
+ * can be used to work with off_t's regardless.
+ */
+#if SIZEOF_OFF_T > 4
+#if HAVE_STRTOLL
+#define strtoofft strtoll
+#else
+long long Curl_strtoll(const char *nptr, char **endptr, int base);
+#define strtoofft Curl_strtoll
+#define NEED_CURL_STRTOLL
+#endif
+#else
+#define strtoofft strtol
+#endif
+
+#endif
+