Attachment 20524 Details for Bug 54773

[patch] rewritten patch for the esser+krahmer issues from Derek

cvs-krahmer-esser-1.11.x.diff (text/plain), 63.74 KB, created by Sebastian Krahmer on 2004-06-01 17:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2004-06-01 17:00:49 UTC

Size: 63.74 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>RCS file: /cvs/ccvs/ChangeLog,v
>retrieving revision 1.692.2.171
>diff -u -p -r1.692.2.171 ChangeLog
>--- ChangeLog	19 May 2004 15:13:29 -0000	1.692.2.171
>+++ ChangeLog	29 May 2004 04:34:33 -0000
>@@ -1,3 +1,9 @@
>+2004-05-28  Derek Price  <derek@ximbiot.com>
>+
>+	* NEWS: Note Stefan & Sebastian's security fixes.
>+	* acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB.
>+	* configure.in: Call gl_XSIZE.
>+
> 2004-05-19  Derek Price  <derek@ximbiot.com>
> 
> 	* NEWS: Note CAN-2004-0396 fix.
>Index: NEWS
>===================================================================
>RCS file: /cvs/ccvs/NEWS,v
>retrieving revision 1.116.2.102
>diff -u -p -r1.116.2.102 NEWS
>--- NEWS	19 May 2004 15:23:20 -0000	1.116.2.102
>+++ NEWS	29 May 2004 04:34:35 -0000
>@@ -1,6 +1,14 @@
> Changes since 1.11.16:
> **********************
> 
>+SERVER SECURITY FIXES
>+
>+* Thanks to Stefan Esser & Sebastian Krahmer, several potential security
>+  problems have been fixed.  The ones which were considered dangerous enough
>+  to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, &
>+  CAN-2004-0418 by the Common Vulnerabilities and Exposures Project.  Please
>+  see <http://www.cve.mitre.org> for more information.
>+
> Changes from 1.11.15 to 1.11.16:
> ********************************
> 
>Index: acinclude.m4
>===================================================================
>RCS file: /cvs/ccvs/Attic/acinclude.m4,v
>retrieving revision 1.6.4.2
>diff -u -p -r1.6.4.2 acinclude.m4
>--- acinclude.m4	30 Apr 2003 14:49:33 -0000	1.6.4.2
>+++ acinclude.m4	29 May 2004 04:34:35 -0000
>@@ -267,3 +267,85 @@ when using GSSAPI.])
>   AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
> fi
> ])dnl
>+
>+
>+
>+# size_max.m4 serial 2
>+dnl Copyright (C) 2003 Free Software Foundation, Inc.
>+dnl This file is free software, distributed under the terms of the GNU
>+dnl General Public License.  As a special exception to the GNU General
>+dnl Public License, this file may be distributed as part of a program
>+dnl that contains a configuration script generated by Autoconf, under
>+dnl the same distribution terms as the rest of that program.
>+
>+dnl From Bruno Haible.
>+
>+AC_DEFUN([gl_SIZE_MAX],
>+[
>+  AC_CHECK_HEADERS(stdint.h)
>+  dnl First test whether the system already has SIZE_MAX.
>+  AC_MSG_CHECKING([for SIZE_MAX])
>+  result=
>+  AC_EGREP_CPP([Found it], [
>+#include <limits.h>
>+#if HAVE_STDINT_H
>+#include <stdint.h>
>+#endif
>+#ifdef SIZE_MAX
>+Found it
>+#endif
>+], result=yes)
>+  if test -z "$result"; then
>+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
>+    dnl than the type 'unsigned long'.
>+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
>+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
>+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
>+      [#include <stddef.h>], result=?)
>+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
>+      [#include <stddef.h>], result=?)
>+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
>+      [#include <stddef.h>], result=?)
>+    if test "$fits_in_uint" = 1; then
>+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
>+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
>+      AC_TRY_COMPILE([#include <stddef.h>
>+        extern size_t foo;
>+        extern unsigned long foo;
>+        ], [], fits_in_uint=0)
>+    fi
>+    if test -z "$result"; then
>+      if test "$fits_in_uint" = 1; then
>+        result="$res_hi$res_lo"U
>+      else
>+        result="$res_hi$res_lo"UL
>+      fi
>+    else
>+      dnl Shouldn't happen, but who knows...
>+      result='~(size_t)0'
>+    fi
>+  fi
>+  AC_MSG_RESULT([$result])
>+  if test "$result" != yes; then
>+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
>+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
>+  fi
>+])
>+
>+
>+
>+# xsize.m4 serial 3
>+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
>+dnl This file is free software, distributed under the terms of the GNU
>+dnl General Public License.  As a special exception to the GNU General
>+dnl Public License, this file may be distributed as part of a program
>+dnl that contains a configuration script generated by Autoconf, under
>+dnl the same distribution terms as the rest of that program.
>+
>+AC_DEFUN([gl_XSIZE],
>+[
>+  dnl Prerequisites of lib/xsize.h.
>+  AC_REQUIRE([gl_SIZE_MAX])
>+  AC_REQUIRE([AC_C_INLINE])
>+  AC_CHECK_HEADERS(stdint.h)
>+])
>Index: aclocal.m4
>===================================================================
>RCS file: /cvs/ccvs/aclocal.m4,v
>retrieving revision 1.23.2.6
>diff -u -p -r1.23.2.6 aclocal.m4
>--- aclocal.m4	19 Nov 2003 20:17:08 -0000	1.23.2.6
>+++ aclocal.m4	29 May 2004 04:34:36 -0000
>@@ -281,6 +281,88 @@ when using GSSAPI.])
> fi
> ])dnl
> 
>+
>+
>+# size_max.m4 serial 2
>+dnl Copyright (C) 2003 Free Software Foundation, Inc.
>+dnl This file is free software, distributed under the terms of the GNU
>+dnl General Public License.  As a special exception to the GNU General
>+dnl Public License, this file may be distributed as part of a program
>+dnl that contains a configuration script generated by Autoconf, under
>+dnl the same distribution terms as the rest of that program.
>+
>+dnl From Bruno Haible.
>+
>+AC_DEFUN([gl_SIZE_MAX],
>+[
>+  AC_CHECK_HEADERS(stdint.h)
>+  dnl First test whether the system already has SIZE_MAX.
>+  AC_MSG_CHECKING([for SIZE_MAX])
>+  result=
>+  AC_EGREP_CPP([Found it], [
>+#include <limits.h>
>+#if HAVE_STDINT_H
>+#include <stdint.h>
>+#endif
>+#ifdef SIZE_MAX
>+Found it
>+#endif
>+], result=yes)
>+  if test -z "$result"; then
>+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
>+    dnl than the type 'unsigned long'.
>+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
>+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
>+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
>+      [#include <stddef.h>], result=?)
>+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
>+      [#include <stddef.h>], result=?)
>+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
>+      [#include <stddef.h>], result=?)
>+    if test "$fits_in_uint" = 1; then
>+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
>+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
>+      AC_TRY_COMPILE([#include <stddef.h>
>+        extern size_t foo;
>+        extern unsigned long foo;
>+        ], [], fits_in_uint=0)
>+    fi
>+    if test -z "$result"; then
>+      if test "$fits_in_uint" = 1; then
>+        result="$res_hi$res_lo"U
>+      else
>+        result="$res_hi$res_lo"UL
>+      fi
>+    else
>+      dnl Shouldn't happen, but who knows...
>+      result='~(size_t)0'
>+    fi
>+  fi
>+  AC_MSG_RESULT([$result])
>+  if test "$result" != yes; then
>+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
>+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
>+  fi
>+])
>+
>+
>+
>+# xsize.m4 serial 3
>+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
>+dnl This file is free software, distributed under the terms of the GNU
>+dnl General Public License.  As a special exception to the GNU General
>+dnl Public License, this file may be distributed as part of a program
>+dnl that contains a configuration script generated by Autoconf, under
>+dnl the same distribution terms as the rest of that program.
>+
>+AC_DEFUN([gl_XSIZE],
>+[
>+  dnl Prerequisites of lib/xsize.h.
>+  AC_REQUIRE([gl_SIZE_MAX])
>+  AC_REQUIRE([AC_C_INLINE])
>+  AC_CHECK_HEADERS(stdint.h)
>+])
>+
> # Do all the work for Automake.                            -*- Autoconf -*-
> 
> # This macro actually does too much some checks are only needed if
>Index: config.h.in
>===================================================================
>RCS file: /cvs/ccvs/config.h.in,v
>retrieving revision 1.71.4.10
>diff -u -p -r1.71.4.10 config.h.in
>--- config.h.in	8 Dec 2003 07:08:18 -0000	1.71.4.10
>+++ config.h.in	29 May 2004 04:34:37 -0000
>@@ -425,6 +425,10 @@
>    */
> #undef SERVER_SUPPORT
> 
>+/* Define as the maximum value of type 'size_t', if the system doesn't define
>+   it. */
>+#undef SIZE_MAX
>+
> /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
> #undef STAT_MACROS_BROKEN
> 
>@@ -486,6 +490,12 @@
> /* Define to `int' if <sys/types.h> doesn't define. */
> #undef gid_t
> 
>+/* Define to `__inline__' or `__inline' if that's what the C compiler
>+   calls it, or to nothing if 'inline' is not supported under any name.  */
>+#ifndef __cplusplus
>+#undef inline
>+#endif
>+
> /* Define to `int' if <sys/types.h> does not define. */
> #undef mode_t
> 
>Index: configure
>===================================================================
>RCS file: /cvs/ccvs/configure,v
>retrieving revision 1.174.2.55
>diff -u -p -r1.174.2.55 configure
>--- configure	19 May 2004 15:23:20 -0000	1.174.2.55
>+++ configure	29 May 2004 04:34:47 -0000
>@@ -6102,6 +6102,1461 @@ done
> 
> 
> 
>+for ac_header in stdint.h
>+do
>+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+fi
>+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+else
>+  # Is the header compilable?
>+echo "$as_me:$LINENO: checking $ac_header usability" >&5
>+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+$ac_includes_default
>+#include <$ac_header>
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_header_compiler=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_header_compiler=no
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+# Is the header present?
>+echo "$as_me:$LINENO: checking $ac_header presence" >&5
>+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <$ac_header>
>+_ACEOF
>+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null; then
>+  if test -s conftest.err; then
>+    ac_cpp_err=$ac_c_preproc_warn_flag
>+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>+  else
>+    ac_cpp_err=
>+  fi
>+else
>+  ac_cpp_err=yes
>+fi
>+if test -z "$ac_cpp_err"; then
>+  ac_header_preproc=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+  ac_header_preproc=no
>+fi
>+rm -f conftest.err conftest.$ac_ext
>+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6
>+
>+# So?  What about this header?
>+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+  yes:no: )
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
>+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
>+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
>+    ac_header_preproc=yes
>+    ;;
>+  no:yes:* )
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
>+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
>+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
>+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
>+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
>+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
>+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
>+    (
>+      cat <<\_ASBOX
>+## ------------------------------ ##
>+## Report this to bug-cvs@gnu.org ##
>+## ------------------------------ ##
>+_ASBOX
>+    ) |
>+      sed "s/^/$as_me: WARNING:     /" >&2
>+    ;;
>+esac
>+echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  eval "$as_ac_Header=\$ac_header_preproc"
>+fi
>+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+
>+fi
>+if test `eval echo '${'$as_ac_Header'}'` = yes; then
>+  cat >>confdefs.h <<_ACEOF
>+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
>+_ACEOF
>+
>+fi
>+
>+done
>+
>+    echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
>+echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
>+  result=
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+
>+#include <limits.h>
>+#if HAVE_STDINT_H
>+#include <stdint.h>
>+#endif
>+#ifdef SIZE_MAX
>+Found it
>+#endif
>+
>+_ACEOF
>+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
>+  $EGREP "Found it" >/dev/null 2>&1; then
>+  result=yes
>+fi
>+rm -f conftest*
>+
>+  if test -z "$result"; then
>+                    if test "$cross_compiling" = yes; then
>+  # Depending upon the size, compute the lo and hi bounds.
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=0 ac_mid=0
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr $ac_mid + 1`
>+		    if test $ac_lo -le $ac_mid; then
>+		      ac_lo= ac_hi=
>+		      break
>+		    fi
>+		    ac_mid=`expr 2 '*' $ac_mid + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=-1 ac_mid=-1
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_hi=`expr '(' $ac_mid ')' - 1`
>+		       if test $ac_mid -le $ac_hi; then
>+			 ac_lo= ac_hi=
>+			 break
>+		       fi
>+		       ac_mid=`expr 2 '*' $ac_mid`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo= ac_hi=
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+# Binary search between lo and hi bounds.
>+while test "x$ac_lo" != "x$ac_hi"; do
>+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr '(' $ac_mid ')' + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+done
>+case $ac_lo in
>+?*) res_hi=$ac_lo;;
>+'') result=? ;;
>+esac
>+else
>+  if test "$cross_compiling" = yes; then
>+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&5
>+echo "$as_me: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&2;}
>+   { (exit 1); exit 1; }; }
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+long longval () { return ~(size_t)0 / 10; }
>+unsigned long ulongval () { return ~(size_t)0 / 10; }
>+#include <stdio.h>
>+#include <stdlib.h>
>+int
>+main ()
>+{
>+
>+  FILE *f = fopen ("conftest.val", "w");
>+  if (! f)
>+    exit (1);
>+  if ((~(size_t)0 / 10) < 0)
>+    {
>+      long i = longval ();
>+      if (i != (~(size_t)0 / 10))
>+	exit (1);
>+      fprintf (f, "%ld\n", i);
>+    }
>+  else
>+    {
>+      unsigned long i = ulongval ();
>+      if (i != (~(size_t)0 / 10))
>+	exit (1);
>+      fprintf (f, "%lu\n", i);
>+    }
>+  exit (ferror (f) || fclose (f) != 0);
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest$ac_exeext
>+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  res_hi=`cat conftest.val`
>+else
>+  echo "$as_me: program exited with status $ac_status" >&5
>+echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+( exit $ac_status )
>+result=?
>+fi
>+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
>+fi
>+fi
>+rm -f conftest.val
>+    if test "$cross_compiling" = yes; then
>+  # Depending upon the size, compute the lo and hi bounds.
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=0 ac_mid=0
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr $ac_mid + 1`
>+		    if test $ac_lo -le $ac_mid; then
>+		      ac_lo= ac_hi=
>+		      break
>+		    fi
>+		    ac_mid=`expr 2 '*' $ac_mid + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=-1 ac_mid=-1
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_hi=`expr '(' $ac_mid ')' - 1`
>+		       if test $ac_mid -le $ac_hi; then
>+			 ac_lo= ac_hi=
>+			 break
>+		       fi
>+		       ac_mid=`expr 2 '*' $ac_mid`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo= ac_hi=
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+# Binary search between lo and hi bounds.
>+while test "x$ac_lo" != "x$ac_hi"; do
>+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr '(' $ac_mid ')' + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+done
>+case $ac_lo in
>+?*) res_lo=$ac_lo;;
>+'') result=? ;;
>+esac
>+else
>+  if test "$cross_compiling" = yes; then
>+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&5
>+echo "$as_me: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&2;}
>+   { (exit 1); exit 1; }; }
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+long longval () { return ~(size_t)0 % 10; }
>+unsigned long ulongval () { return ~(size_t)0 % 10; }
>+#include <stdio.h>
>+#include <stdlib.h>
>+int
>+main ()
>+{
>+
>+  FILE *f = fopen ("conftest.val", "w");
>+  if (! f)
>+    exit (1);
>+  if ((~(size_t)0 % 10) < 0)
>+    {
>+      long i = longval ();
>+      if (i != (~(size_t)0 % 10))
>+	exit (1);
>+      fprintf (f, "%ld\n", i);
>+    }
>+  else
>+    {
>+      unsigned long i = ulongval ();
>+      if (i != (~(size_t)0 % 10))
>+	exit (1);
>+      fprintf (f, "%lu\n", i);
>+    }
>+  exit (ferror (f) || fclose (f) != 0);
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest$ac_exeext
>+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  res_lo=`cat conftest.val`
>+else
>+  echo "$as_me: program exited with status $ac_status" >&5
>+echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+( exit $ac_status )
>+result=?
>+fi
>+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
>+fi
>+fi
>+rm -f conftest.val
>+    if test "$cross_compiling" = yes; then
>+  # Depending upon the size, compute the lo and hi bounds.
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=0 ac_mid=0
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr $ac_mid + 1`
>+		    if test $ac_lo -le $ac_mid; then
>+		      ac_lo= ac_hi=
>+		      break
>+		    fi
>+		    ac_mid=`expr 2 '*' $ac_mid + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=-1 ac_mid=-1
>+  while :; do
>+    cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_lo=$ac_mid; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_hi=`expr '(' $ac_mid ')' - 1`
>+		       if test $ac_mid -le $ac_hi; then
>+			 ac_lo= ac_hi=
>+			 break
>+		       fi
>+		       ac_mid=`expr 2 '*' $ac_mid`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+  done
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo= ac_hi=
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+# Binary search between lo and hi bounds.
>+while test "x$ac_lo" != "x$ac_hi"; do
>+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+int
>+main ()
>+{
>+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
>+test_array [0] = 0
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_hi=$ac_mid
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_lo=`expr '(' $ac_mid ')' + 1`
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+done
>+case $ac_lo in
>+?*) fits_in_uint=$ac_lo;;
>+'') result=? ;;
>+esac
>+else
>+  if test "$cross_compiling" = yes; then
>+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&5
>+echo "$as_me: error: cannot run test program while cross compiling
>+See \`config.log' for more details." >&2;}
>+   { (exit 1); exit 1; }; }
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
>+unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
>+#include <stdio.h>
>+#include <stdlib.h>
>+int
>+main ()
>+{
>+
>+  FILE *f = fopen ("conftest.val", "w");
>+  if (! f)
>+    exit (1);
>+  if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
>+    {
>+      long i = longval ();
>+      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
>+	exit (1);
>+      fprintf (f, "%ld\n", i);
>+    }
>+  else
>+    {
>+      unsigned long i = ulongval ();
>+      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
>+	exit (1);
>+      fprintf (f, "%lu\n", i);
>+    }
>+  exit (ferror (f) || fclose (f) != 0);
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest$ac_exeext
>+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>+  (eval $ac_link) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  fits_in_uint=`cat conftest.val`
>+else
>+  echo "$as_me: program exited with status $ac_status" >&5
>+echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+( exit $ac_status )
>+result=?
>+fi
>+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
>+fi
>+fi
>+rm -f conftest.val
>+    if test "$fits_in_uint" = 1; then
>+                  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <stddef.h>
>+        extern size_t foo;
>+        extern unsigned long foo;
>+
>+int
>+main ()
>+{
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  fits_in_uint=0
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+    fi
>+    if test -z "$result"; then
>+      if test "$fits_in_uint" = 1; then
>+        result="$res_hi$res_lo"U
>+      else
>+        result="$res_hi$res_lo"UL
>+      fi
>+    else
>+            result='~(size_t)0'
>+    fi
>+  fi
>+  echo "$as_me:$LINENO: result: $result" >&5
>+echo "${ECHO_T}$result" >&6
>+  if test "$result" != yes; then
>+
>+cat >>confdefs.h <<_ACEOF
>+#define SIZE_MAX $result
>+_ACEOF
>+
>+  fi
>+
>+echo "$as_me:$LINENO: checking for inline" >&5
>+echo $ECHO_N "checking for inline... $ECHO_C" >&6
>+if test "${ac_cv_c_inline+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  ac_cv_c_inline=no
>+for ac_kw in inline __inline__ __inline; do
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#ifndef __cplusplus
>+typedef int foo_t;
>+static $ac_kw foo_t static_foo () {return 0; }
>+$ac_kw foo_t foo () {return 0; }
>+#endif
>+
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_cv_c_inline=$ac_kw; break
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+done
>+
>+fi
>+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
>+echo "${ECHO_T}$ac_cv_c_inline" >&6
>+
>+
>+case $ac_cv_c_inline in
>+  inline | yes) ;;
>+  *)
>+    case $ac_cv_c_inline in
>+      no) ac_val=;;
>+      *) ac_val=$ac_cv_c_inline;;
>+    esac
>+    cat >>confdefs.h <<_ACEOF
>+#ifndef __cplusplus
>+#define inline $ac_val
>+#endif
>+_ACEOF
>+    ;;
>+esac
>+
>+
>+
>+
>+
>+for ac_header in stdint.h
>+do
>+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+fi
>+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+else
>+  # Is the header compilable?
>+echo "$as_me:$LINENO: checking $ac_header usability" >&5
>+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+$ac_includes_default
>+#include <$ac_header>
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } &&
>+	 { ac_try='test -z "$ac_c_werror_flag"
>+			 || test ! -s conftest.err'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; } &&
>+	 { ac_try='test -s conftest.$ac_objext'
>+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+  (eval $ac_try) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; }; then
>+  ac_header_compiler=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+ac_header_compiler=no
>+fi
>+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
>+echo "${ECHO_T}$ac_header_compiler" >&6
>+
>+# Is the header present?
>+echo "$as_me:$LINENO: checking $ac_header presence" >&5
>+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
>+cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include <$ac_header>
>+_ACEOF
>+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } >/dev/null; then
>+  if test -s conftest.err; then
>+    ac_cpp_err=$ac_c_preproc_warn_flag
>+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
>+  else
>+    ac_cpp_err=
>+  fi
>+else
>+  ac_cpp_err=yes
>+fi
>+if test -z "$ac_cpp_err"; then
>+  ac_header_preproc=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+  ac_header_preproc=no
>+fi
>+rm -f conftest.err conftest.$ac_ext
>+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
>+echo "${ECHO_T}$ac_header_preproc" >&6
>+
>+# So?  What about this header?
>+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
>+  yes:no: )
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
>+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
>+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
>+    ac_header_preproc=yes
>+    ;;
>+  no:yes:* )
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
>+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
>+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
>+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
>+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
>+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
>+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
>+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
>+    (
>+      cat <<\_ASBOX
>+## ------------------------------ ##
>+## Report this to bug-cvs@gnu.org ##
>+## ------------------------------ ##
>+_ASBOX
>+    ) |
>+      sed "s/^/$as_me: WARNING:     /" >&2
>+    ;;
>+esac
>+echo "$as_me:$LINENO: checking for $ac_header" >&5
>+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
>+if eval "test \"\${$as_ac_Header+set}\" = set"; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  eval "$as_ac_Header=\$ac_header_preproc"
>+fi
>+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
>+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
>+
>+fi
>+if test `eval echo '${'$as_ac_Header'}'` = yes; then
>+  cat >>confdefs.h <<_ACEOF
>+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
>+_ACEOF
>+
>+fi
>+
>+done
>+
>+
>+
>+
> cat >>confdefs.h <<\_ACEOF
> #define getpass cvs_getpass
> _ACEOF
>Index: configure.in
>===================================================================
>RCS file: /cvs/ccvs/configure.in,v
>retrieving revision 1.176.2.50
>diff -u -p -r1.176.2.50 configure.in
>--- configure.in	19 May 2004 15:23:22 -0000	1.176.2.50
>+++ configure.in	29 May 2004 04:34:48 -0000
>@@ -191,6 +191,7 @@ AC_REPLACE_FUNCS(\
> dnl
> dnl Begin GNULIB stuff.
> dnl
>+gl_XSIZE
> 
> dnl We always want to use the GNULIB getpass, so define its name to something
> dnl that won't conflict with system declarations.
>Index: lib/ChangeLog
>===================================================================
>RCS file: /cvs/ccvs/lib/ChangeLog,v
>retrieving revision 1.169.2.25
>diff -u -p -r1.169.2.25 ChangeLog
>--- lib/ChangeLog	15 May 2004 17:25:14 -0000	1.169.2.25
>+++ lib/ChangeLog	29 May 2004 04:34:49 -0000
>@@ -1,3 +1,8 @@
>+2004-05-28  Derek Price  <derek@ximbiot.com>
>+
>+	* xsize.h: New file from GNULIB.
>+	* Makefile.am (libcvs_a_SOURCES): Add xsize.h.
>+
> 2004-05-15  Derek Price  <derek@ximbiot.com>
> 
> 	* libcvs.dsp: Header file list updated.
>Index: lib/Makefile.am
>===================================================================
>RCS file: /cvs/ccvs/lib/Makefile.am,v
>retrieving revision 1.9.4.4
>diff -u -p -r1.9.4.4 Makefile.am
>--- lib/Makefile.am	19 May 2004 15:13:34 -0000	1.9.4.4
>+++ lib/Makefile.am	29 May 2004 04:34:49 -0000
>@@ -88,6 +88,9 @@ EXTRA_DIST = \
> 	libcvs.dep libcvs.dsp libcvs.mak \
> 	xgssapi.h
> 
>+# For the xsize module from GNULIB.
>+libcvs_a_SOURCES += xsize.h
>+
> # Until Automake gets its act together
> distclean-local:
> 	rm -f fnmatch.h
>Index: lib/Makefile.in
>===================================================================
>RCS file: /cvs/ccvs/lib/Makefile.in,v
>retrieving revision 1.61.4.8
>diff -u -p -r1.61.4.8 Makefile.in
>--- lib/Makefile.in	19 May 2004 15:13:34 -0000	1.61.4.8
>+++ lib/Makefile.in	29 May 2004 04:34:49 -0000
>@@ -166,6 +166,8 @@ noinst_LIBRARIES = libcvs.a
> # Also should look into unifying regular expression matching in CVS
> # with the diff library (perhaps to have the caller, CVS, do the
> # matching?)
>+
>+# For the xsize module from GNULIB.
> libcvs_a_SOURCES = \
> 	argmatch.c \
> 	getdate.y \
>@@ -189,8 +191,8 @@ libcvs_a_SOURCES = \
> 	system.h \
> 	wait.h \
> 	xselect.h \
>-	xtime.h
>-
>+	xtime.h\
>+xsize.h
> libcvs_a_LIBADD = @LIBOBJS@
> 
> EXTRA_DIST = \
>Index: lib/xsize.h
>===================================================================
>RCS file: lib/xsize.h
>diff -N lib/xsize.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ lib/xsize.h	29 May 2004 04:34:49 -0000
>@@ -0,0 +1,108 @@
>+/* xsize.h -- Checked size_t computations.
>+
>+   Copyright (C) 2003 Free Software Foundation, Inc.
>+
>+   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, 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
>+   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.  */
>+
>+#ifndef _XSIZE_H
>+#define _XSIZE_H
>+
>+/* Get size_t.  */
>+#include <stddef.h>
>+
>+/* Get SIZE_MAX.  */
>+#include <limits.h>
>+#if HAVE_STDINT_H
>+# include <stdint.h>
>+#endif
>+
>+/* The size of memory objects is often computed through expressions of
>+   type size_t. Example:
>+      void* p = malloc (header_size + n * element_size).
>+   These computations can lead to overflow.  When this happens, malloc()
>+   returns a piece of memory that is way too small, and the program then
>+   crashes while attempting to fill the memory.
>+   To avoid this, the functions and macros in this file check for overflow.
>+   The convention is that SIZE_MAX represents overflow.
>+   malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
>+   implementation that uses mmap --, it's recommended to use size_overflow_p()
>+   or size_in_bounds_p() before invoking malloc().
>+   The example thus becomes:
>+      size_t size = xsum (header_size, xtimes (n, element_size));
>+      void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
>+*/
>+
>+/* Convert an arbitrary value >= 0 to type size_t.  */
>+#define xcast_size_t(N) \
>+  ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
>+
>+/* Sum of two sizes, with overflow check.  */
>+static inline size_t
>+#if __GNUC__ >= 3
>+__attribute__ ((__pure__))
>+#endif
>+xsum (size_t size1, size_t size2)
>+{
>+  size_t sum = size1 + size2;
>+  return (sum >= size1 ? sum : SIZE_MAX);
>+}
>+
>+/* Sum of three sizes, with overflow check.  */
>+static inline size_t
>+#if __GNUC__ >= 3
>+__attribute__ ((__pure__))
>+#endif
>+xsum3 (size_t size1, size_t size2, size_t size3)
>+{
>+  return xsum (xsum (size1, size2), size3);
>+}
>+
>+/* Sum of four sizes, with overflow check.  */
>+static inline size_t
>+#if __GNUC__ >= 3
>+__attribute__ ((__pure__))
>+#endif
>+xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
>+{
>+  return xsum (xsum (xsum (size1, size2), size3), size4);
>+}
>+
>+/* Maximum of two sizes, with overflow check.  */
>+static inline size_t
>+#if __GNUC__ >= 3
>+__attribute__ ((__pure__))
>+#endif
>+xmax (size_t size1, size_t size2)
>+{
>+  /* No explicit check is needed here, because for any n:
>+     max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX.  */
>+  return (size1 >= size2 ? size1 : size2);
>+}
>+
>+/* Multiplication of a count with an element size, with overflow check.
>+   The count must be >= 0 and the element size must be > 0.
>+   This is a macro, not an inline function, so that it works correctly even
>+   when N is of a wider tupe and N > SIZE_MAX.  */
>+#define xtimes(N, ELSIZE) \
>+  ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
>+
>+/* Check for overflow.  */
>+#define size_overflow_p(SIZE) \
>+  ((SIZE) == SIZE_MAX)
>+/* Check against overflow.  */
>+#define size_in_bounds_p(SIZE) \
>+  ((SIZE) != SIZE_MAX)
>+
>+#endif /* _XSIZE_H */
>Index: src/ChangeLog
>===================================================================
>RCS file: /cvs/ccvs/src/ChangeLog,v
>retrieving revision 1.2336.2.284
>diff -u -p -r1.2336.2.284 ChangeLog
>--- src/ChangeLog	19 May 2004 15:13:34 -0000	1.2336.2.284
>+++ src/ChangeLog	29 May 2004 04:34:57 -0000
>@@ -1,3 +1,12 @@
>+2004-05-28  Derek Price  <derek@ximbiot.com>
>+
>+	* commit.c, filesubr.c, history.c, server.c, wrapper.c: Various
>+	security fixes.
>+	(Original patch from Stefan Essler <s.esser@e-matters.de> & Sebastian
>+	Krahmer <krahmer@suse.de>.)
>+
>+	* cvs.h: Include xsize.h.
>+
> 2004-05-19  Derek Price  <derek@ximbiot.com>
> 
> 	* server.c (serve_unchanged, serve_is_modified): Overwrite existing
>Index: src/commit.c
>===================================================================
>RCS file: /cvs/ccvs/src/commit.c,v
>retrieving revision 1.187.4.23
>diff -u -p -r1.187.4.23 commit.c
>--- src/commit.c	5 May 2004 16:10:04 -0000	1.187.4.23
>+++ src/commit.c	29 May 2004 04:34:59 -0000
>@@ -523,7 +523,12 @@ commit (argc, argv)
> 	   operate on, and only work with those files in the future.
> 	   This saves time--we don't want to search the file system
> 	   of the working directory twice.  */
>-	find_args.argv = (char **) xmalloc (find_args.argc * sizeof (char **));
>+	if (size_overflow_p (xtimes (find_args.argc, sizeof (char **))))
>+	{
>+	    find_args.argc = 0;
>+	    return 0;
>+	}
>+	find_args.argv = xmalloc (xtimes (find_args.argc, sizeof (char **)));
> 	find_args.argc = 0;
> 	walklist (find_args.ulist, copy_ulist, &find_args);
> 
>Index: src/cvs.h
>===================================================================
>RCS file: /cvs/ccvs/src/cvs.h,v
>retrieving revision 1.235.4.24
>diff -u -p -r1.235.4.24 cvs.h
>--- src/cvs.h	7 May 2004 14:13:22 -0000	1.235.4.24
>+++ src/cvs.h	29 May 2004 04:34:59 -0000
>@@ -40,6 +40,10 @@
> #include "popen.h"
> #endif
> 
>+/* Begin GNULIB headers.  */
>+#include "xsize.h"
>+/* End GNULIB headers.  */
>+
> #ifdef STDC_HEADERS
> #include <stdlib.h>
> #else
>Index: src/filesubr.c
>===================================================================
>RCS file: /cvs/ccvs/src/filesubr.c,v
>retrieving revision 1.59.4.11
>diff -u -p -r1.59.4.11 filesubr.c
>--- src/filesubr.c	5 Apr 2004 00:26:04 -0000	1.59.4.11
>+++ src/filesubr.c	29 May 2004 04:35:00 -0000
>@@ -1029,8 +1029,14 @@ expand_wild (argc, argv, pargc, pargv)
>     char ***pargv;
> {
>     int i;
>+    if (size_overflow_p (xtimes (argc, sizeof (char *)))) {
>+	*pargc = 0;
>+	*pargv = NULL;
>+	error (0, 0, "expand_wild: too many arguments");
>+	return;
>+    }
>     *pargc = argc;
>-    *pargv = (char **) xmalloc (argc * sizeof (char *));
>+    *pargv = xmalloc (xtimes (argc, sizeof (char *)));
>     for (i = 0; i < argc; ++i)
> 	(*pargv)[i] = xstrdup (argv[i]);
> }
>Index: src/history.c
>===================================================================
>RCS file: /cvs/ccvs/src/history.c,v
>retrieving revision 1.58.4.6
>diff -u -p -r1.58.4.6 history.c
>--- src/history.c	20 Mar 2004 18:14:56 -0000	1.58.4.6
>+++ src/history.c	29 May 2004 04:35:01 -0000
>@@ -416,8 +416,11 @@ history (argc, argv)
> 		working = 1;
> 		break;
> 	    case 'X':			/* Undocumented debugging flag */
>+#ifdef DEBUG
> 		histfile = optarg;
>+#endif
> 		break;
>+
> 	    case 'D':			/* Since specified date */
> 		if (*since_rev || *since_tag || *backto)
> 		{
>@@ -906,9 +909,13 @@ save_user (name)
> {
>     if (user_count == user_max)
>     {
>-	user_max += USER_INCREMENT;
>-	user_list = (char **) xrealloc ((char *) user_list,
>-					(int) user_max * sizeof (char *));
>+	user_max = xsum (user_max, USER_INCREMENT);
>+	if (size_overflow_p (xtimes (user_max, sizeof (char *))))
>+	{
>+	    error (0, 0, "save_user: too many users");
>+	    return;
>+	}
>+	user_list = xrealloc (user_list, xtimes (user_max, sizeof (char *)));
>     }
>     user_list[user_count++] = xstrdup (name);
> }
>@@ -936,9 +943,13 @@ save_file (dir, name, module)
> 
>     if (file_count == file_max)
>     {
>-	file_max += FILE_INCREMENT;
>-	file_list = (struct file_list_str *) xrealloc ((char *) file_list,
>-						   file_max * sizeof (*fl));
>+	file_max = xsum (file_max, FILE_INCREMENT);
>+	if (size_overflow_p (xtimes (file_max, sizeof (*fl))))
>+	{
>+	    error (0, 0, "save_file: too many files");
>+	    return;
>+	}
>+	file_list = xrealloc (file_list, xtimes (file_max, sizeof (*fl)));
>     }
>     fl = &file_list[file_count++];
>     fl->l_file = cp = xmalloc (strlen (dir) + strlen (name) + 2);
>@@ -977,9 +988,13 @@ save_module (module)
> {
>     if (mod_count == mod_max)
>     {
>-	mod_max += MODULE_INCREMENT;
>-	mod_list = (char **) xrealloc ((char *) mod_list,
>-				       mod_max * sizeof (char *));
>+	mod_max = xsum (mod_max, MODULE_INCREMENT);
>+	if (size_overflow_p (xtimes (mod_max, sizeof (char *))))
>+	{
>+	    error (0, 0, "save_module: too many modules");
>+	    return;
>+	}
>+	mod_list = xrealloc (mod_list, xtimes (mod_max, sizeof (char *)));
>     }
>     mod_list[mod_count++] = xstrdup (module);
> }
>Index: src/server.c
>===================================================================
>RCS file: /cvs/ccvs/src/server.c,v
>retrieving revision 1.284.2.33
>diff -u -p -r1.284.2.33 server.c
>--- src/server.c	19 May 2004 15:13:35 -0000	1.284.2.33
>+++ src/server.c	29 May 2004 04:35:06 -0000
>@@ -917,7 +917,7 @@ serve_max_dotdot (arg)
>     int i;
>     char *p;
> 
>-    if (lim < 0)
>+    if (lim < 0 || lim > 10000)
> 	return;
>     p = xmalloc (strlen (server_temp_dir) + 2 * lim + 10);
>     if (p == NULL)
>@@ -2018,6 +2018,9 @@ serve_notify (arg)
>     {
> 	char *cp;
> 
>+	if (!data[0])
>+	    goto error;
>+
> 	if (strchr (data, '+'))
> 	    goto error;
> 
>@@ -2149,6 +2152,14 @@ serve_argument (arg)
>     char *p;
> 
>     if (error_pending()) return;
>+    
>+    if (argument_count >= 10000)
>+    {
>+	if (alloc_pending (80))
>+	    sprintf (pending_error_text, 
>+		     "E Protocol error: too many arguments");
>+	return;
>+    }
> 
>     if (argument_vector_size <= argument_count)
>     {
>@@ -2179,6 +2190,14 @@ serve_argumentx (arg)
>     char *p;
> 
>     if (error_pending()) return;
>+    
>+    if (argument_count <= 1) 
>+    {
>+	if (alloc_pending (80))
>+	    sprintf (pending_error_text,
>+		     "E Protocol error: called argumentx without prior call to argument");
>+	return;
>+    }
> 
>     p = argument_vector[argument_count - 1];
>     p = xrealloc (p, strlen (p) + 1 + strlen (arg) + 1);
>@@ -2512,7 +2531,7 @@ check_command_legal_p (cmd_name)
> 		    save some code here...  -kff */
> 
> 		 /* Chop newline by hand, for strcmp()'s sake. */
>-		 if (linebuf[num_red - 1] == '\n')
>+                 if (num_red > 0 && linebuf[num_red - 1] == '\n')
> 		     linebuf[num_red - 1] = '\0';
> 
> 		 if (strcmp (linebuf, CVS_Username) == 0)
>@@ -2567,7 +2586,7 @@ check_command_legal_p (cmd_name)
> 	 while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
> 	 {
> 	     /* Chop newline by hand, for strcmp()'s sake. */
>-	     if (linebuf[num_red - 1] == '\n')
>+	     if (num_red > 0 && linebuf[num_red - 1] == '\n')
> 		 linebuf[num_red - 1] = '\0';
> 
> 	     if (strcmp (linebuf, CVS_Username) == 0)
>Index: src/wrapper.c
>===================================================================
>RCS file: /cvs/ccvs/src/wrapper.c,v
>retrieving revision 1.31.4.1
>diff -u -p -r1.31.4.1 wrapper.c
>--- src/wrapper.c	20 Jul 2003 16:52:44 -0000	1.31.4.1
>+++ src/wrapper.c	29 May 2004 04:35:06 -0000
>@@ -237,6 +237,30 @@ wrap_unparse_rcs_options (line, first_ca
> #endif /* SERVER_SUPPORT || CLIENT_SUPPORT */
> 
> /*
>+ * Remove fmt str specifier other than %% or %s. And allow
>+ * only max_s %s specifiers
>+ */
>+wrap_clean_fmt_str(char *fmt, int max_s)
>+{
>+    while (*fmt) {
>+	if (fmt[0] == '%' && fmt[1])
>+	{
>+	    if (fmt[1] == '%') 
>+		fmt++;
>+	    else
>+		if (fmt[1] == 's' && max_s > 0)
>+		{
>+		    max_s--;
>+		    fmt++;
>+		} else 
>+		    *fmt = ' ';
>+	}
>+	fmt++;
>+    }
>+    return;
>+}
>+
>+/*
>  * Open a file and read lines, feeding each line to a line parser. Arrange
>  * for keeping a temporary list of wrappers at the end, if the "temp"
>  * argument is set.
>@@ -556,9 +580,8 @@ wrap_tocvs_process_file(fileName)
>     args = xmalloc (strlen (e->tocvsFilter)
> 		    + strlen (fileName)
> 		    + strlen (buf));
>-    /* FIXME: sprintf will blow up if the format string contains items other
>-       than %s, or contains too many %s's.  We should instead be parsing
>-       e->tocvsFilter ourselves and giving a real error.  */
>+
>+    wrap_clean_fmt_str(e->tocvsFilter, 2);
>     sprintf (args, e->tocvsFilter, fileName, buf);
>     run_setup (args);
>     run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY );
>@@ -590,9 +613,8 @@ wrap_fromcvs_process_file(fileName)
> 
>     args = xmalloc (strlen (e->fromcvsFilter)
> 		    + strlen (fileName));
>-    /* FIXME: sprintf will blow up if the format string contains items other
>-       than %s, or contains too many %s's.  We should instead be parsing
>-       e->fromcvsFilter ourselves and giving a real error.  */
>+
>+    wrap_clean_fmt_str(e->fromcvsFilter, 1);
>     sprintf (args, e->fromcvsFilter, fileName);
>     run_setup (args);
>     run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL );

Actions: View | Diff

Attachments on bug 54773: 18913 | 18919 | 18920 | 19603 | 20020 | 20405 | 20524 | 20697