[svn-r339] Changes since 19980408

---------------------- ./src/H5Osdspace.c ./html/H5.format.html In the past we were allowed to have >2GB files on a 32-bit machine as long as no dataset within the file was larger than 4GB (or whatever sizeof(size_t) is). That's been fixed now. All dataset size calculations are done with `hsize_t' which is normally defined as `unsigned long long'. ./src/H5F.c ./src/H5Ffamily.c ./src/H5Fprivate.h ./src/H5P.c ./src/H5Ppublic.h The file family member size can now be set/queried. The default is still 64MB, but it can be set to 1GB by saying: H5Pset_family (plist, 30, H5P_DEFAULT); When opening an existing file family the specified bits-per-member is ignored and the first member of the family determines the bits-per-member, which can be retrieved with H5Pget_family(). ./acconfig.h ./configure.in ./src/H5config.h ./src/H5public.h Added `--disable-hsizet' so that those with old GCC compilers (<2.8.1) can still compile the code. ./src/H5.c ./src/H5private.h Added HDfprintf() which works just like fprintf() except you can give `H' as a size modifier for the integer conversions and supply an `hsize_t' or `hssize_t' argument without casting it. For instance: hsize_t npoints = H5Sget_npoints(space); HDfprintf(stdout,"Dataset has %Hd (%#018Hx) points\n", npoints, npoints); You can now give `%a' as a format to print an address, but all formating flags are ignored and it causes the return value of HDfprintf() to not include the characters in the address (but who uses the return value anyway :-). Example: H5G_t *grp; HDfprintf(stdout, "Group object header at %a\n", &(grp->ent.header)); Added HDstrtoll() which works exactly like [HD]strtol() except the result is an int64. ./src/debug.c Large addresses can now be entered from the command-line. Use either decimal, octal (leading `0') or hexadecimal (leading `0x') when giving the address. ./src/h5ls.c The printf format for dataset dimensions was changed to `%Hu' to support large datasets. ./test/big.c [NEW] A test for big datasets on 32-bit machines. This test is not run by default. Don't try to run it on an nfs-mounted file system or other file system that doesn't support holes because it creates two 32GB datasets of all zero.
19 files changed, 888 insertions, 341 deletions
diff --git a/MANIFEST b/MANIFEST
index 58e473b..28a7e71 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -185,6 +185,7 @@
 ./src/hdf5.h
 ./test/.distdep
 ./test/Makefile.in
+./test/big.c
 ./test/cmpd_dset.c
 ./test/dsets.c
 ./test/dspace.c
diff --git a/acconfig.h b/acconfig.h
index 83d2f17..4f5b402 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,3 +6,6 @@
 
 /* Define if we have parallel support */
 #undef HAVE_PARALLEL
+
+/* Define if it's safe to use `long long' for hsize_t and hssize_t */
+#undef HAVE_LARGE_HSIZET
diff --git a/configure b/configure
index 2a8184d..567d80d 100755
--- a/configure
+++ b/configure
@@ -15,6 +15,13 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
 --enable-production=yes|no  Determines how to run the compiler."
 ac_help="$ac_help
+--disable-hsizet          Datasets can normally be larger than memory
+                             and/or files but some compilers are unable to
+                             handle this (including versions of GCC before
+                             2.8.0).  Disabling the feature causes dataset
+                             sizes to be restricted to the size of core memory,
+                             or 'size_t'."
+ac_help="$ac_help
 --enable-debug=all        Turn on debugging in all packages.  One may also
                           specify a comma-separated list of package names
                           without the leading H5 or the word no.  The default
@@ -555,7 +562,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:559: checking host system type" >&5
+echo "configure:566: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -578,7 +585,7 @@ echo "$ac_t""$host" 1>&6
 
 
 echo $ac_n "checking for cached host""... $ac_c" 1>&6
-echo "configure:582: checking for cached host" >&5
+echo "configure:589: checking for cached host" >&5
 if eval "test \"`echo '$''{'hdf5_cv_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -597,7 +604,7 @@ fi
 
 
 echo $ac_n "checking for site config file""... $ac_c" 1>&6
-echo "configure:601: checking for site config file" >&5
+echo "configure:608: checking for site config file" >&5
 site_config="none"
 for f in $host \
          $host_vendor-$host_os \
@@ -620,7 +627,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:624: checking for $ac_word" >&5
+echo "configure:631: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -649,7 +656,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:653: checking for $ac_word" >&5
+echo "configure:660: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -697,7 +704,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:701: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:708: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -707,11 +714,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 711 "configure"
+#line 718 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -731,12 +738,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:742: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:740: checking whether we are using GNU C" >&5
+echo "configure:747: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -745,7 +752,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -760,7 +767,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:764: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:771: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -788,7 +795,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:792: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:799: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -825,7 +832,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:829: checking for a BSD compatible install" >&5
+echo "configure:836: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -877,7 +884,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:881: checking for $ac_word" >&5
+echo "configure:888: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -910,7 +917,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:914: checking for $ac_word" >&5
+echo "configure:921: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -943,7 +950,7 @@ fi
 
 
 echo $ac_n "checking for GNU Make""... $ac_c" 1>&6
-echo "configure:947: checking for GNU Make" >&5
+echo "configure:954: checking for GNU Make" >&5
 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
   sed -n 1p|cut -c1-8`" = "GNU Make"; then
    echo "$ac_t""yes" 1>&6
@@ -957,7 +964,7 @@ if test Xyes = "X$GCC"; then
 fi
 
 echo $ac_n "checking for production mode""... $ac_c" 1>&6
-echo "configure:961: checking for production mode" >&5
+echo "configure:968: checking for production mode" >&5
 # Check whether --enable-production or --disable-production was given.
 if test "${enable_production+set}" = set; then
   enableval="$enable_production"
@@ -988,7 +995,7 @@ esac
 
 
 echo $ac_n "checking for main in -lcoug""... $ac_c" 1>&6
-echo "configure:992: checking for main in -lcoug" >&5
+echo "configure:999: checking for main in -lcoug" >&5
 ac_lib_var=`echo coug'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -996,14 +1003,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcoug  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1000 "configure"
+#line 1007 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1032,7 +1039,7 @@ fi
 	
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1036: checking how to run the C preprocessor" >&5
+echo "configure:1043: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1047,13 +1054,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1051 "configure"
+#line 1058 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1064,13 +1071,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1068 "configure"
+#line 1075 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1093,12 +1100,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1097: checking for ANSI C header files" >&5
+echo "configure:1104: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1102 "configure"
+#line 1109 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1106,7 +1113,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1123,7 +1130,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1134 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1141,7 +1148,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1145 "configure"
+#line 1152 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1162,7 +1169,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1173 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1173,7 +1180,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1200,17 +1207,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1204: checking for $ac_hdr" >&5
+echo "configure:1211: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1209 "configure"
+#line 1216 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1239,12 +1246,12 @@ done
 
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1243: checking for off_t" >&5
+echo "configure:1250: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1248 "configure"
+#line 1255 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1272,12 +1279,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1276: checking for size_t" >&5
+echo "configure:1283: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1281 "configure"
+#line 1288 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1304,148 +1311,15 @@ EOF
 
 fi
 
-
-
-
-for ac_func in getpwuid gethostname system
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1314: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1319 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
-#include "confdefs.h"
-#include<sys/types.h>
-int main() {
-off64_t n = 0;
-; return 0; }
-EOF
-if { (eval echo configure:1375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  for ac_func in lseek64 fseek64
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1380: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1385 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""skipping test for lseek64() and fseek64()" 1>&6
-fi
-rm -f conftest*
-
-
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1442: checking whether byte ordering is bigendian" >&5
+echo "configure:1316: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1323 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1456,11 +1330,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 1464 "configure"
+#line 1338 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1471,7 +1345,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -1491,7 +1365,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1495 "configure"
+#line 1369 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -1504,7 +1378,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -1528,7 +1402,7 @@ EOF
 fi
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1532: checking size of short" >&5
+echo "configure:1406: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1536,7 +1410,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 1540 "configure"
+#line 1414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1547,7 +1421,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1567,7 +1441,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1571: checking size of int" >&5
+echo "configure:1445: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1575,7 +1449,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1579 "configure"
+#line 1453 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1586,7 +1460,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -1606,7 +1480,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1610: checking size of long" >&5
+echo "configure:1484: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1614,7 +1488,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1618 "configure"
+#line 1492 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1625,7 +1499,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -1645,7 +1519,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1649: checking size of long long" >&5
+echo "configure:1523: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1653,7 +1527,7 @@ else
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1657 "configure"
+#line 1531 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1664,7 +1538,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -1684,7 +1558,7 @@ EOF
 
 
 echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:1688: checking size of float" >&5
+echo "configure:1562: checking size of float" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1692,7 +1566,7 @@ else
   ac_cv_sizeof_float=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1696 "configure"
+#line 1570 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1703,7 +1577,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_float=`cat conftestval`
 else
@@ -1723,7 +1597,7 @@ EOF
 
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1727: checking size of double" >&5
+echo "configure:1601: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1731,7 +1605,7 @@ else
   ac_cv_sizeof_double=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 1735 "configure"
+#line 1609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1742,7 +1616,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
 else
@@ -1762,7 +1636,7 @@ EOF
 
 
 echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:1766: checking size of size_t" >&5
+echo "configure:1640: checking size of size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1770,7 +1644,7 @@ else
   ac_cv_sizeof_size_t=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1774 "configure"
+#line 1648 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1781,7 +1655,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_size_t=`cat conftestval`
 else
@@ -1804,7 +1678,7 @@ cat >>confdefs.h <<\EOF
 #include <sys/types.h> /*for off_t definition*/
 EOF
 echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:1808: checking size of off_t" >&5
+echo "configure:1682: checking size of off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1812,7 +1686,7 @@ else
   ac_cv_sizeof_off_t=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1816 "configure"
+#line 1690 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1823,7 +1697,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:1827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_off_t=`cat conftestval`
 else
@@ -1843,16 +1717,166 @@ EOF
 
 
 
+# Check whether --enable-hsizet or --disable-hsizet was given.
+if test "${enable_hsizet+set}" = set; then
+  enableval="$enable_hsizet"
+  HSIZET=$enableval
+fi
+
+echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6
+echo "configure:1728: checking for sizeof hsize_t and hssize_t" >&5
+case $HSIZET in
+    no|small)
+	echo "$ac_t""small" 1>&6
+	;;
+    *)
+        echo "$ac_t""large" 1>&6
+        cat >> confdefs.h <<\EOF
+#define HAVE_LARGE_HSIZET 1
+EOF
+
+	;;
+esac
+
+
+for ac_func in getpwuid gethostname system
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1746: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1751 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+cat > conftest.$ac_ext <<EOF
+#line 1800 "configure"
+#include "confdefs.h"
+#include<sys/types.h>
+int main() {
+off64_t n = 0;
+; return 0; }
+EOF
+if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  for ac_func in lseek64 fseek64
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1812: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1817 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""skipping test for lseek64() and fseek64()" 1>&6
+fi
+rm -f conftest*
 
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1851: checking for working const" >&5
+echo "configure:1875: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1856 "configure"
+#line 1880 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1901,7 +1925,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1922,21 +1946,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1926: checking for inline" >&5
+echo "configure:1950: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1933 "configure"
+#line 1957 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1963,16 +1987,16 @@ esac
 
 
 echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6
-echo "configure:1967: checking for __attribute__ extension" >&5
+echo "configure:1991: checking for __attribute__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1969 "configure"
+#line 1993 "configure"
 #include "confdefs.h"
 
 int main() {
 int __attribute__((unused)) f(void){return 1;}
 ; return 0; }
 EOF
-if { (eval echo configure:1976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_ATTRIBUTE 1
@@ -1988,16 +2012,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6
-echo "configure:1992: checking for __FUNCTION__ extension" >&5
+echo "configure:2016: checking for __FUNCTION__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1994 "configure"
+#line 2018 "configure"
 #include "confdefs.h"
 
 int main() {
 int f(void){return __FUNCTION__;}
 ; return 0; }
 EOF
-if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_FUNCTION 1
@@ -2013,7 +2037,7 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for debug flags""... $ac_c" 1>&6
-echo "configure:2017: checking for debug flags" >&5;
+echo "configure:2041: checking for debug flags" >&5;
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -2051,7 +2075,7 @@ if test "${enable_parallel+set}" = set; then
 fi
 
 echo $ac_n "checking for parallel support""... $ac_c" 1>&6
-echo "configure:2055: checking for parallel support" >&5;
+echo "configure:2079: checking for parallel support" >&5;
 
 
 
@@ -2077,7 +2101,7 @@ EOF
       CPPFLAGS="$CPPFLAGS $MPI_INC"
       CFLAGS="$CFLAGS $MPI_LIB"
       echo $ac_n "checking for main in -lmpi""... $ac_c" 1>&6
-echo "configure:2081: checking for main in -lmpi" >&5
+echo "configure:2105: checking for main in -lmpi" >&5
 ac_lib_var=`echo mpi'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2085,14 +2109,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmpi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2089 "configure"
+#line 2113 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2119,7 +2143,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
         echo $ac_n "checking for main in -lmpio""... $ac_c" 1>&6
-echo "configure:2123: checking for main in -lmpio" >&5
+echo "configure:2147: checking for main in -lmpio" >&5
 ac_lib_var=`echo mpio'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2127,14 +2151,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmpio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2131 "configure"
+#line 2155 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
diff --git a/configure.in b/configure.in
index c4a9ef7..e976474 100644
--- a/configure.in
+++ b/configure.in
@@ -136,27 +136,10 @@ AC_CHECK_HEADERS(unistd.h)
 
 
 dnl ----------------------------------------------------------------------
-dnl Data types.
+dnl Data types and their sizes.
 dnl
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
-
-
-
-dnl ----------------------------------------------------------------------
-dnl Check for functions.
-dnl
-AC_CHECK_FUNCS(getpwuid gethostname system)
-
-AC_TRY_COMPILE([#include<sys/types.h>],
-	       [off64_t n = 0;],
-	       AC_CHECK_FUNCS(lseek64 fseek64),
-	       AC_MSG_RESULT([skipping test for lseek64() and fseek64()]))
-
-
-dnl ----------------------------------------------------------------------
-dnl Check sizes of various integral data types.
-dnl
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
@@ -170,6 +153,35 @@ cat >>confdefs.h <<\EOF
 EOF
 AC_CHECK_SIZEOF(off_t, 4)
 
+AC_ARG_ENABLE(hsizet,
+  [--disable-hsizet          Datasets can normally be larger than memory
+                             and/or files but some compilers are unable to
+                             handle this (including versions of GCC before
+                             2.8.0).  Disabling the feature causes dataset
+                             sizes to be restricted to the size of core memory,
+                             or 'size_t'.],
+  HSIZET=$enableval)
+AC_MSG_CHECKING(for sizeof hsize_t and hssize_t)
+case $HSIZET in
+    no|small)
+	AC_MSG_RESULT(small)
+	;;
+    *)
+        AC_MSG_RESULT(large)
+        AC_DEFINE(HAVE_LARGE_HSIZET)
+	;;
+esac
+
+
+dnl ----------------------------------------------------------------------
+dnl Check for functions.
+dnl
+AC_CHECK_FUNCS(getpwuid gethostname system)
+
+AC_TRY_COMPILE([#include<sys/types.h>],
+	       [off64_t n = 0;],
+	       AC_CHECK_FUNCS(lseek64 fseek64),
+	       AC_MSG_RESULT([skipping test for lseek64() and fseek64()]))
 
 
 dnl ----------------------------------------------------------------------
diff --git a/src/H5.c b/src/H5.c
index 90ea07c..64363e4 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -35,6 +35,10 @@ static char             RcsId[] = "@(#)$Revision$";
    H5_init_interface    -- initialize the H5 interface
    + */
 
+#include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+
 /* private headers */
 #include <H5private.h>          /*library                 */
 #include <H5ACprivate.h>        /*cache                           */
@@ -369,3 +373,368 @@ H5close (void)
     H5_term_library ();
     return SUCCEED;
 }
+
+
+/*-------------------------------------------------------------------------
+ * Function:	HDfprintf
+ *
+ * Purpose:	Prints the optional arguments under the control of the format
+ *		string FMT to the stream STREAM.  This function takes the
+ *		same format as fprintf(3c) with a few added features:
+ *
+ *		The conversion modifier `H' refers to the size of an
+ *		`hsize_t' or `hssize_t' type.  For instance, "0x%018Hx"
+ *		prints an `hsize_t' value as a hex number right justified and
+ *		zero filled in an 18-character field.
+ *
+ *		The conversion `a' refers to an `haddr_t*' type. Field widths
+ *		and other flags are ignored and the address is printed by
+ *		calling H5F_addr_print().
+ *
+ * Bugs:	Return value will be incorrect if `%a' appears in the format
+ *		string.
+ *
+ * Return:	Success:	Number of characters printed
+ *
+ *		Failure:	-1
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, April  9, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+HDfprintf (FILE *stream, const char *fmt, ...)
+{
+    int		n, nout = 0;
+    int		fwidth, prec;
+    int		zerofill;
+    int		leftjust;
+    int		plussign;
+    int		ldspace;
+    int		prefix;
+    int		modifier;
+    int		conv;
+    char	*rest, template[128];
+    const char	*s;
+    va_list	ap;
+    
+    assert (stream);
+    assert (fmt);
+
+    va_start (ap, fmt);
+    while (*fmt) {
+	fwidth = prec = 0;
+	zerofill = 0;
+	leftjust = 0;
+	plussign = 0;
+	prefix = 0;
+	ldspace = 0;
+	modifier = 0;
+
+	if ('%'==fmt[0] && '%'==fmt[1]) {
+	    putc ('%', stream);
+	    fmt += 2;
+	    nout++;
+	} else if ('%'==fmt[0]) {
+	    s = fmt+1;
+
+	    /* Flags */
+	    while (strchr ("-+ #", *s)) {
+		switch (*s) {
+		case '-':
+		    leftjust = 1;
+		    break;
+		case '+':
+		    plussign = 1;
+		    break;
+		case ' ':
+		    ldspace = 1;
+		    break;
+		case '#':
+		    prefix = 1;
+		    break;
+		}
+		s++;
+	    }
+	    
+	    /* Field width */
+	    if (isdigit (*s)) {
+		zerofill = ('0'==*s);
+		fwidth = strtol (s, &rest, 10);
+		s = rest;
+	    } else if ('*'==*s) {
+		fwidth = va_arg (ap, int);
+		if (fwidth<0) {
+		    leftjust = 1;
+		    fwidth = -fwidth;
+		}
+		s++;
+	    }
+
+	    /* Precision */
+	    if ('.'==*s) {
+		s++;
+		if (isdigit (*s)) {
+		    prec = strtol (s+1, &rest, 10);
+		    s = rest;
+		} else if ('*'==*s) {
+		    prec = va_arg (ap, int);
+		    s++;
+		}
+		if (prec<1) prec = 1;
+	    }
+
+	    /* Type modifier */
+	    if (strchr ("Hhlq", *s)) {
+		switch (*s) {
+		case 'H':
+		    if (sizeof(hsize_t)==sizeof(long)) {
+			modifier = 'l';
+		    } else if (sizeof(hsize_t)==sizeof(long long)) {
+			modifier = 'q';
+		    }
+		    break;
+		default:
+		    modifier = *s;
+		    break;
+		}
+		s++;
+	    }
+
+	    /* Conversion */
+	    conv = *s++;
+
+	    /* Create the format template */
+	    sprintf (template, "%%%s%s%s%s%s",
+		     leftjust?"-":"", plussign?"+":"",
+		     ldspace?" ":"", prefix?"#":"", zerofill?"0":"");
+	    if (fwidth>0) {
+		sprintf (template+strlen (template), "%d", fwidth);
+	    }
+	    if (prec>0) {
+		sprintf (template+strlen (template), ".%d", prec);
+	    }
+	    if (modifier) {
+		sprintf (template+strlen (template), "%c", modifier);
+	    }
+	    sprintf (template+strlen (template), "%c", conv);
+	    
+
+	    /* Conversion */
+	    switch (conv) {
+	    case 'd':
+	    case 'i':
+		if ('h'==modifier) {
+		    short x = va_arg (ap, short);
+		    n = fprintf (stream, template, x);
+		} else if (!modifier) {
+		    int x = va_arg (ap, int);
+		    n = fprintf (stream, template, x);
+		} else if ('l'==modifier) {
+		    long x = va_arg (ap, long);
+		    n = fprintf (stream, template, x);
+		} else if ('q'==modifier) {
+		    long long x = va_arg (ap, long long);
+		    n = fprintf (stream, template, x);
+		}
+		break;
+
+	    case 'o':
+	    case 'u':
+	    case 'x':
+	    case 'X':
+		if ('h'==modifier) {
+		    unsigned short x = va_arg (ap, unsigned short);
+		    n = fprintf (stream, template, x);
+		} else if (!modifier) {
+		    unsigned int x = va_arg (ap, unsigned int);
+		    n = fprintf (stream, template, x);
+		} else if ('l'==modifier) {
+		    unsigned long x = va_arg (ap, unsigned long);
+		    n = fprintf (stream, template, x);
+		} else if ('q'==modifier) {
+		    unsigned long long x = va_arg (ap, unsigned long long);
+		    n = fprintf (stream, template, x);
+		}
+		break;
+
+	    case 'f':
+	    case 'e':
+	    case 'E':
+	    case 'g':
+	    case 'G':
+		if ('h'==modifier) {
+		    float x = va_arg (ap, float);
+		    n = fprintf (stream, template, x);
+		} else if (!modifier || 'l'==modifier) {
+		    double x = va_arg (ap, double);
+		    n = fprintf (stream, template, x);
+		} else if ('q'==modifier) {
+		    long double x = va_arg (ap, long double);
+		    n = fprintf (stream, template, x);
+		}
+
+	    case 'a':
+		if (1) {
+		    haddr_t *x = va_arg (ap, haddr_t*);
+		    H5F_addr_print (stream, x);
+		    n = 0;
+		}
+		break;
+
+	    case 'c':
+		if (1) {
+		    char x = va_arg (ap, char);
+		    n = fprintf (stream, template, x);
+		}
+		break;
+
+	    case 's':
+	    case 'p':
+		if (1) {
+		    char *x = va_arg (ap, char*);
+		    n = fprintf (stream, template, x);
+		}
+		break;
+
+	    case 'n':
+		if (1) {
+		    template[strlen(template)-1] = 'u';
+		    n = fprintf (stream, template, nout);
+		}
+		break;
+
+	    default:
+		fputs (template, stream);
+		n = strlen (template);
+		break;
+	    }
+	    nout += n;
+	    fmt = s;
+	} else {
+	    putc (*fmt, stream);
+	    fmt++;
+	    nout++;
+	}
+    }
+    va_end (ap);
+    return nout;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	HDstrtoll
+ *
+ * Purpose:	Converts the string S to an int64 value according to the
+ *		given BASE, which must be between 2 and 36 inclusive, or be
+ *		the special value zero.
+ *
+ *		The string must begin with an arbitrary amount of white space
+ *		(as determined by isspace(3c)) followed by a single optional
+ *              `+' or `-' sign.  If BASE is zero or 16 the string may then
+ *		include a `0x' or `0X' prefix, and the number will be read in
+ *		base 16; otherwise a zero BASE is taken as 10 (decimal)
+ *		unless the next character is a `0', in which case it is taken
+ *		as 8 (octal).
+ *
+ *		The remainder of the string is converted to an int64 in the
+ *		obvious manner, stopping at the first character which is not
+ *		a valid digit in the given base.  (In bases above 10, the
+ *		letter `A' in either upper or lower case represetns 10, `B'
+ *		represents 11, and so forth, with `Z' representing 35.)
+ *
+ *		If REST is not null, the address of the first invalid
+ *		character in S is stored in *REST.  If there were no digits
+ *		at all, the original value of S is stored in *REST.  Thus, if
+ *		*S is not `\0' but **REST is `\0' on return the entire string
+ *		was valid.
+ *
+ * Return:	Success:	The result.
+ *
+ *		Failure:	If the input string does not contain any
+ *				digits then zero is returned and REST points
+ *				to the original value of S.  If an overflow
+ *				or underflow occurs then the maximum or
+ *				minimum possible value is returned and the
+ *				global `errno' is set to ERANGE.  If BASE is
+ *				incorrect then zero is returned.
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, April  9, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int64
+HDstrtoll (const char *s, const char **rest, int base)
+{
+    int64	sign=1, acc=0;
+    hbool_t	overflow = FALSE;
+    
+    errno = 0;
+    if (!s || (base && (base<2 || base>36))) {
+	if (rest) *rest = s;
+	return 0;
+    }
+    
+    /* Skip white space */
+    while (isspace (*s)) s++;
+
+    /* Optional minus or plus sign */
+    if ('+'==*s) {
+	s++;
+    } else if ('-'==*s) {
+	sign = -1;
+	s++;
+    }
+
+    /* Zero base prefix */
+    if (0==base && '0'==*s && ('x'==s[1] || 'X'==s[1])) {
+	base = 16;
+	s += 2;
+    } else if (0==base && '0'==*s) {
+	base = 8;
+	s++;
+    } else if (0==base) {
+	base = 10;
+    }
+    
+    /* Digits */
+    while ((base<=10 && *s>='0' && *s<'0'+base) ||
+	   (base>10 && ((*s>='0' && *s<='9') ||
+			(*s>='a' && *s<'a'+base-10) ||
+			(*s>='A' && *s<'A'+base-10)))) {
+	if (!overflow) {
+	    int64 digit;
+	    if (*s>='0' && *s<='9') digit = *s - '0';
+	    else if (*s>='a' && *s<='z') digit = *s-'a'+10;
+	    else digit = *s-'A'+10;
+
+	    if (acc*base+digit < acc) {
+		overflow = TRUE;
+	    } else {
+		acc = acc*base + digit;
+	    }
+	}
+	s++;
+    }
+
+    /* Overflow */
+    if (overflow) {
+	if (sign>0) {
+	    acc = ((uint64)1<<(8*sizeof(int64)-1))-1;
+	} else {
+	    acc = (uint64)1<<(8*sizeof(int64)-1);
+	}
+	errno = ERANGE;
+    }
+
+    /* Return values */
+    acc *= sign;
+    if (rest) *rest = s;
+    return acc;
+}
diff --git a/src/H5F.c b/src/H5F.c
index f7193c9..042273f 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -155,7 +155,7 @@ H5F_init_interface(void)
 #elif (H5F_LOW_DFLT == H5F_LOW_SPLIT)
     /* Nothing to initialize */
 #elif (H5F_LOW_DFLT == H5F_LOW_FAMILY)
-    /* Nothing to initialize */
+    H5F_access_dflt.u.fam.offset_bits = 26u; /*64MB members*/
 #else
 #   error "Unknown default file driver"
 #endif
@@ -809,11 +809,16 @@ H5F_open(const char *name, uintn flags,
 
     /*
      * Update the file creation parameters and file access parameters with
-     * default values if this is the first time this file is opened.
+     * default values if this is the first time this file is opened.  Some of
+     * the properties may need to be updated.
      */
     if (1 == f->shared->nrefs) {
 	f->shared->create_parms = *create_parms;
 	f->shared->access_parms = *access_parms;
+	if (H5F_LOW_FAMILY==f->shared->access_parms.driver) {
+	    size_t x = f->shared->lf->u.fam.offset_bits;
+	    f->shared->access_parms.u.fam.offset_bits = x;
+	}
     }
     cp = &(f->shared->create_parms);
 
diff --git a/src/H5Ffamily.c b/src/H5Ffamily.c
	Commit message (Expand)	Author	Age	Files	Lines
*	Fix a typo/cut-n-paste error in DBCursor.join_item so that it doesn't	Gregory P. Smith	2003-07-07	1	-1/+1

*	DB.remove() needs to set the internal DB handle to NULL after being called.	Gregory P. Smith	2003-05-15	1	-4/+1

*	Added a comment about backward compatibility requirements and a link	Barry Warsaw	2003-04-24	1	-1/+9

*	Update to the new PyGILState APIs to simplify and correct thread-state	Mark Hammond	2003-04-22	1	-2/+15

*	init_bsddb(): Added a few symbols that Greg forgot.	Barry Warsaw	2003-03-31	1	-1/+4

*	4.1.5	Gregory P. Smith	2003-03-27	1	-1/+1

*	Adds support for the DBEnv->set_timeout() method.	Gregory P. Smith	2003-03-27	1	-0/+26

*	version 4.1.4 (4.1.3 just released)	Gregory P. Smith	2003-02-03	1	-1/+1

*	Bump the version number	Barry Warsaw	2003-01-28	1	-1/+1

*	bugfix: do not double-close DB cursor during deallocation when the	Gregory P. Smith	2003-01-17	1	-1/+3

*	bugfix: allow the module to work with python compiled without thread support.	Gregory P. Smith	2003-01-17	1	-0/+2

*	bugfix: disallow use of DB_TXN after commit() or abort(), prevents a	Gregory P. Smith	2003-01-17	1	-5/+37

*	Port BerkeleyDB 4.1 support from the pybsddb project. bsddb is now at	Barry Warsaw	2002-12-30	1	-74/+333

*	Merge with bsddb3 2002.11.23.10.42.36	Martin v. Löwis	2002-11-23	1	-8/+16

*	Import PyBSDDB 3.4.0. Rename historical wrapper to bsddb185.	Martin v. Löwis	2002-11-19	1	-0/+4246