===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/Attic/inp_str.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.1 -r1.1.1.3
--- OpenXM_contrib/gmp/mpz/Attic/inp_str.c	2000/01/10 15:35:27	1.1.1.1
+++ OpenXM_contrib/gmp/mpz/Attic/inp_str.c	2003/08/25 16:06:33	1.1.1.3
@@ -1,21 +1,26 @@
 /* mpz_inp_str(dest_integer, stream, base) -- Input a number in base
    BASE from stdio stream STREAM and store the result in DEST_INTEGER.
 
-Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc.
+   OF THE FUNCTIONS IN THIS FILE, ONLY mpz_inp_str IS FOR EXTERNAL USE, THE
+   REST ARE INTERNALS AND ARE ALMOST CERTAIN TO BE SUBJECT TO INCOMPATIBLE
+   CHANGES OR DISAPPEAR COMPLETELY IN FUTURE GNU MP RELEASES.
 
+Copyright 1991, 1993, 1994, 1996, 1998, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
 option) any later version.
 
 The GNU MP Library 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 Library General Public
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
-You should have received a copy of the GNU Library General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
@@ -26,9 +31,7 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 
 static int
-digit_value_in_base (c, base)
-     int c;
-     int base;
+digit_value_in_base (int c, int base)
 {
   int digit;
 
@@ -47,28 +50,14 @@ digit_value_in_base (c, base)
 }
 
 size_t
-#if __STDC__
-mpz_inp_str (mpz_ptr dest, FILE *stream, int base)
-#else
-mpz_inp_str (dest, stream, base)
-     mpz_ptr dest;
-     FILE *stream;
-     int base;
-#endif
+mpz_inp_str (mpz_ptr x, FILE *stream, int base)
 {
-  char *str;
-  size_t alloc_size, str_size;
   int c;
-  int negative;
-  mp_size_t dest_size;
   size_t nread;
 
   if (stream == 0)
     stream = stdin;
 
-  alloc_size = 100;
-  str = (char *) (*_mp_allocate_func) (alloc_size);
-  str_size = 0;
   nread = 0;
 
   /* Skip whitespace.  */
@@ -79,11 +68,24 @@ mpz_inp_str (dest, stream, base)
     }
   while (isspace (c));
 
+  return mpz_inp_str_nowhite (x, stream, base, c, nread);
+}
+
+/* shared by mpq_inp_str */
+size_t
+mpz_inp_str_nowhite (mpz_ptr x, FILE *stream, int base, int c, size_t nread)
+{
+  char *str;
+  size_t alloc_size, str_size;
+  int negative;
+  mp_size_t xsize;
+
   negative = 0;
   if (c == '-')
     {
       negative = 1;
       c = getc (stream);
+      nread++;
     }
 
   if (digit_value_in_base (c, base == 0 ? 10 : base) < 0)
@@ -105,9 +107,26 @@ mpz_inp_str (dest, stream, base)
 	      c = getc (stream);
 	      nread++;
 	    }
+	  else if (c == 'b' || c == 'B')
+	    {
+	      base = 2;
+	      c = getc (stream);
+	      nread++;
+	    }
 	}
     }
 
+  /* Skip leading zeros.  */
+  while (c == '0')
+    {
+      c = getc (stream);
+      nread++;
+    }
+
+  alloc_size = 100;
+  str = (char *) (*__gmp_allocate_func) (alloc_size);
+  str_size = 0;
+
   for (;;)
     {
       int dig;
@@ -115,7 +134,7 @@ mpz_inp_str (dest, stream, base)
 	{
 	  size_t old_alloc_size = alloc_size;
 	  alloc_size = alloc_size * 3 / 2;
-	  str = (char *) (*_mp_reallocate_func) (str, old_alloc_size, alloc_size);
+	  str = (char *) (*__gmp_reallocate_func) (str, old_alloc_size, alloc_size);
 	}
       dig = digit_value_in_base (c, base);
       if (dig < 0)
@@ -123,16 +142,28 @@ mpz_inp_str (dest, stream, base)
       str[str_size++] = dig;
       c = getc (stream);
     }
+  nread += str_size;
 
   ungetc (c, stream);
+  nread--;
 
-  dest_size = str_size / __mp_bases[base].chars_per_limb + 1;
-  if (dest->_mp_alloc < dest_size)
-    _mpz_realloc (dest, dest_size);
+  /* Make sure the string is not empty, mpn_set_str would fail.  */
+  if (str_size == 0)
+    {
+      x->_mp_size = 0;
+    }
+  else
+    {
+      xsize = (((mp_size_t)
+                (str_size / __mp_bases[base].chars_per_bit_exactly))
+               / GMP_NUMB_BITS + 2);
+      if (x->_mp_alloc < xsize)
+        _mpz_realloc (x, xsize);
 
-  dest_size = mpn_set_str (dest->_mp_d, (unsigned char *) str, str_size, base);
-  dest->_mp_size = negative ? -dest_size : dest_size;
-
-  (*_mp_free_func) (str, alloc_size);
-  return str_size + nread;
+      /* Convert the byte array in base BASE to our bignum format.  */
+      xsize = mpn_set_str (x->_mp_d, (unsigned char *) str, str_size, base);
+      x->_mp_size = negative ? -xsize : xsize;
+    }
+  (*__gmp_free_func) (str, alloc_size);
+  return nread;
 }