[svn-r136] ./MANIFEST

./src/Makefile.in
	Added H5Ffamily.c and H5Fsplit.c

./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
	Added `const' to sublass arguments.

./src/H5F.c
./src/H5Flow.c
./src/H5Fsec2.c
	Make sure file buffers get flushed during a call to
	H5Fflush().  Check for overflow in address encoding and decoding.

./src/H5Ffam.c
./src/H5Fprivate.c
./test/istore.c
	Implementation of file families so 32-bit machines can access
	64-bit files.

./src/H5Oprivate.h
	Removed H5O_NO_ADDR constant.

./config/freebsd2.2.1
./config/linux
	Added -DH5G_DEBUG and -DH5F_DEBUG to the list of debugging flags.

./html/H5.format.html
	Changed some <offset>-sized things to <length>-sized things.

./src/H5AC.c
./src/H5ACprivate.h
./src/H5B.c
./src/H5Bprivate.h
./src/H5C.c
./src/H5D.c
./src/H5F.c
./src/H5Fcore.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gshad.c
./src/H5Gstab.c
./src/H5H.c
./src/H5Hprivate.h
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
./src/H5Ocont.c
./src/H5Oistore.c
./src/H5Oprivate.h
./src/H5Ostab.c
./src/H5Ostdst.c
./src/H5pivate.h
./src/debug.c
./test/istore.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
	Lots of changes caused by generalizing addresses.  The haddr_t
	is now a struct, so you can no longer perform arithmetic on
	it. But since it's small, simple, and often used, storage is
	allocated like with an integer.  But we always pass them
	around by reference.  That is, when using an address in
	another struct, allocate space:

		struct my_struct {
		   char *name;
		   haddr_t address;
                } x;

	But when passing it to a function, pass by reference:

		H5F_addr_print (stderr, &(x.address));

	Addresses should be initialized with

		H5F_addr_undef (&(x.address));

	Functions for operating on addresses are in H5Flow.c and begin
	with H5F_addr_...  Functions never return haddr_t or haddr_t*;
	they always pass them through arguments instead. A function
	that returns an address through an argument does so with its
	last argument and it is marked with `/*out*/'.  Calls to such
	functions also mark output-only arguments with `/*out*/'

./src/H5Fsplit.c       (new)
	A two-member family where all meta data goes in the first
	member and all raw data goes in the second member.

./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5H.c
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
	Differentiate between meta data storage and raw data
	storage. Provide a mechanism so that the file driver can
	extend the file to allocate more memory.

./src/H5E.c
./src/H5Epublic.c
	Added the error H5E_TRUNCATED to be reported when the file is
	shorter than the length recorded in the boot block.

./src/H5F.c
	Added H5F_locate_signature() so we only do it in one place
	now.

./INSTALL
./INSTALL_MAINT
	Just a couple clarifications.

./html/ExternalFiles.html
./html/storage.html
	Documents how external files work.

./test/hyperslab.c
./test/istore.c
	Fixed printf's on 64-bit machines.

./test/istore.c
	Added ifdef's to test the split file driver.

1 files changed, 52 insertions, 67 deletions

diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c
index cc8f4c6..2cd613b 100644
--- a/src/H5Fstdio.c
+++ b/src/H5Fstdio.c
@@ -23,13 +23,11 @@ static hbool_t interface_initialize_g = FALSE;
 static H5F_low_t *H5F_stdio_open (const char *name, uintn flags,
 				  H5F_search_t *key);
 static herr_t H5F_stdio_close (H5F_low_t *lf);
-static herr_t H5F_stdio_read (H5F_low_t *lf, haddr_t addr, size_t size,
+static herr_t H5F_stdio_read (H5F_low_t *lf, const haddr_t *addr, size_t size,
 			      uint8 *buf);
-static herr_t H5F_stdio_write (H5F_low_t *lf, haddr_t addr, size_t size,
+static herr_t H5F_stdio_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
 			      const uint8 *buf);
 static herr_t H5F_stdio_flush (H5F_low_t *lf);
-static size_t H5F_stdio_size (H5F_low_t *lf);
-
 
 const H5F_low_class_t H5F_LOW_STDIO[1] = {{
    NULL,			/* use default access(2) func  		*/
@@ -38,10 +36,9 @@ const H5F_low_class_t H5F_LOW_STDIO[1] = {{
    H5F_stdio_read,		/* read method				*/
    H5F_stdio_write, 		/* write method				*/
    H5F_stdio_flush, 		/* flush method				*/
-   H5F_stdio_size, 		/* file size method			*/
+   NULL, 			/* extend method			*/
 }};
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_stdio_open
@@ -70,7 +67,7 @@ const H5F_low_class_t H5F_LOW_STDIO[1] = {{
  *-------------------------------------------------------------------------
  */
 static H5F_low_t *
-H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key)
+H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key/*out*/)
 {
    H5F_low_t	*lf=NULL;
    FILE		*f=NULL;
@@ -104,6 +101,12 @@ H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key)
    lf->u.stdio.f = f;
    lf->u.stdio.op = H5F_OP_SEEK;
    lf->u.stdio.cur = 0;
+   H5F_addr_reset (&(lf->eof));
+   if (fseek (lf->u.stdio.f, 0, SEEK_END)<=0) {
+      lf->u.stdio.op = H5F_OP_UNKNOWN;
+   } else {
+      H5F_addr_inc (&(lf->eof), ftell (lf->u.stdio.f));
+   }
 
    /* The unique key */
    if (key) {
@@ -153,8 +156,8 @@ H5F_stdio_close (H5F_low_t *lf)
  * Function:	H5F_stdio_read
  *
  * Purpose:	Reads SIZE bytes beginning at address ADDR in file LF and
- *		places them in buffer BUF.  Reading past the end of the
- *		file returns zeros instead of failing.
+ *		places them in buffer BUF.  Reading past the logical or
+ *		physical end of file returns zeros instead of failing.
  *
  * Errors:
  *		IO        READERROR     Fread failed. 
@@ -172,22 +175,44 @@ H5F_stdio_close (H5F_low_t *lf)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_stdio_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
+H5F_stdio_read (H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
 {
    size_t	n;
+   off_t	offset;
    
    FUNC_ENTER (H5F_stdio_read, NULL, FAIL);
 
+   /* Check for overflow */
+   offset = addr->offset;
+   assert ("address overflowed" && offset==addr->offset);
+   assert ("overflow" && offset+size>=offset);
+
+   /* Check easy cases */
+   if (0==size) HRETURN (SUCCEED);
+   if (offset>=lf->eof.offset) {
+      HDmemset (buf, 0, size);
+      HRETURN (SUCCEED);
+   }
+   
    /*
     * Seek to the correct file position.
     */
    if (!H5F_OPT_SEEK ||
        lf->u.stdio.op!=H5F_OP_READ ||
-       lf->u.stdio.cur!=addr) {
-      if (fseek (lf->u.stdio.f, addr, SEEK_SET)<0) {
+       lf->u.stdio.cur!=offset) {
+      if (fseek (lf->u.stdio.f, offset, SEEK_SET)<0) {
 	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL); /*fseek failed*/
       }
-      lf->u.stdio.cur = addr;
+      lf->u.stdio.cur = offset;
+   }
+
+   /*
+    * Read zeros past the logical end of file (physical is handled below)
+    */   
+   if ((size_t)offset+size>lf->eof.offset) {
+      size_t nbytes = (size_t)offset+size - lf->eof.offset;
+      HDmemset (buf+size-nbytes, 0, nbytes);
+      size -= nbytes;
    }
 
    /*
@@ -207,11 +232,10 @@ H5F_stdio_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
     * Update the file position data.
     */
    lf->u.stdio.op = H5F_OP_READ;
-   lf->u.stdio.cur = addr + n;
+   lf->u.stdio.cur = offset + n;
    FUNC_LEAVE (SUCCEED);
 }
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_stdio_write
@@ -235,22 +259,28 @@ H5F_stdio_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_stdio_write (H5F_low_t *lf, haddr_t addr, size_t size, const uint8 *buf)
+H5F_stdio_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
+		 const uint8 *buf)
 {
-   int	status;
+   off_t	offset;
 
    FUNC_ENTER (H5F_stdio_write, NULL, FAIL);
 
+   /* Check for overflow */
+   offset = addr->offset;
+   assert ("address overflowed" && offset==addr->offset);
+   assert ("overflow" && offset+size>=offset);
+
    /*
     * Seek to the correct file position.
     */
    if (!H5F_OPT_SEEK ||
        lf->u.stdio.op!=H5F_OP_WRITE ||
-       lf->u.stdio.cur!=addr) {
-      if (fseek (lf->u.stdio.f, addr, SEEK_SET)<0) {
+       lf->u.stdio.cur!=offset) {
+      if (fseek (lf->u.stdio.f, offset, SEEK_SET)<0) {
 	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL); /*fseek failed*/
       }
-      lf->u.stdio.cur = addr;
+      lf->u.stdio.cur = offset;
    }
 
    /*
@@ -258,8 +288,7 @@ H5F_stdio_write (H5F_low_t *lf, haddr_t addr, size_t size, const uint8 *buf)
     * advanced by the number of bytes read.  Otherwise nobody knows where it
     * is.
     */
-   status = fwrite (buf, 1, size, lf->u.stdio.f);
-   if (size != status) {
+   if (size != fwrite (buf, 1, size, lf->u.stdio.f)) {
       lf->u.stdio.op = H5F_OP_UNKNOWN;
       HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL); /*fwrite failed*/
    }
@@ -268,11 +297,10 @@ H5F_stdio_write (H5F_low_t *lf, haddr_t addr, size_t size, const uint8 *buf)
     * Update seek optimizing data.
     */
    lf->u.stdio.op = H5F_OP_WRITE;
-   lf->u.stdio.cur = addr + size;
+   lf->u.stdio.cur = offset + size;
    FUNC_LEAVE (SUCCEED);
 }
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_stdio_flush
@@ -313,46 +341,3 @@ H5F_stdio_flush (H5F_low_t *lf)
    
    FUNC_LEAVE (SUCCEED);
 }
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5F_stdio_size
- *
- * Purpose:	Returns the current size of the file in bytes.
- *
- * Bugs:	There is no way to determine if this function failed.
- *
- * Errors:
- *		IO        SEEKERROR     Fseek failed. 
- *
- * Return:	Success:	Size of file in bytes
- *
- *		Failure:	0
- *
- * Programmer:	Robb Matzke
- *              Wednesday, October 22, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static size_t
-H5F_stdio_size (H5F_low_t *lf)
-{
-   off_t	size;
-   
-   FUNC_ENTER (H5F_stdio_size, NULL, 0);
-
-   /* Seek to the end and get the file offset */
-   if (fseek (lf->u.stdio.f, 0, SEEK_END)<0) {
-      HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, 0); /*fseek failed*/
-   }
-   size = ftell (lf->u.stdio.f);
-
-   /* Update seek opt data */
-   lf->u.stdio.op = H5F_OP_SEEK;
-   lf->u.stdio.cur = size;
-
-   FUNC_LEAVE (size);
-}
-