svn commit: samba r23985 - in branches/SAMBA_3_0_25/source/tdb/common: .

[obnox at samba.org]

Author: obnox
Date: 2007-07-21 20:04:41 +0000 (Sat, 21 Jul 2007)
New Revision: 23985

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23985

Log:
Merge r23979:

Fix another occurence of (written != requested) as an
error condition to write. This is in tdb_new_database.

Fix one call to tdb_new_database in tdb_open_ex to not
overwrite the newly propagated errno (typically ENOSPC).

Michael



Modified:
   branches/SAMBA_3_0_25/source/tdb/common/open.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/tdb/common/open.c
===================================================================
--- branches/SAMBA_3_0_25/source/tdb/common/open.c	2007-07-21 20:01:53 UTC (rev 23984)
+++ branches/SAMBA_3_0_25/source/tdb/common/open.c	2007-07-21 20:04:41 UTC (rev 23985)
@@ -50,7 +50,9 @@
 static int tdb_new_database(struct tdb_context *tdb, int hash_size)
 {
 	struct tdb_header *newdb;
-	int size, ret = -1;
+	size_t size;
+	int ret = -1;
+	ssize_t written;
 
 	/* We make it up in memory, then write it out if not internal */
 	size = sizeof(struct tdb_header) + (hash_size+1)*sizeof(tdb_off_t);
@@ -79,10 +81,22 @@
 	memcpy(&tdb->header, newdb, sizeof(tdb->header));
 	/* Don't endian-convert the magic food! */
 	memcpy(newdb->magic_food, TDB_MAGIC_FOOD, strlen(TDB_MAGIC_FOOD)+1);
-	if (write(tdb->fd, newdb, size) != size) {
-		ret = -1;
-	} else {
+	/* we still have "ret == -1" here */
+	written = write(tdb->fd, newdb, size);
+	if (written == size) {
 		ret = 0;
+	} else if (written != -1) {
+		/* call write once again, this usually should return -1 and
+		 * set errno appropriately */
+		size -= written;
+		written = write(tdb->fd, newdb+written, size);
+		if (written == size) {
+			ret = 0;
+		} else if (written >= 0) {
+			/* a second incomplete write - we give up.
+			 * guessing the errno... */
+			errno = ENOSPC;
+		}
 	}
 
   fail:
@@ -217,13 +231,16 @@
 		}
 	}
 
+	errno = 0;
 	if (read(tdb->fd, &tdb->header, sizeof(tdb->header)) != sizeof(tdb->header)
 	    || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0
 	    || (tdb->header.version != TDB_VERSION
 		&& !(rev = (tdb->header.version==TDB_BYTEREV(TDB_VERSION))))) {
 		/* its not a valid database - possibly initialise it */
 		if (!(open_flags & O_CREAT) || tdb_new_database(tdb, hash_size) == -1) {
-			errno = EIO; /* ie bad format or something */
+			if (errno == 0) {
+				errno = EIO; /* ie bad format or something */
+			}
 			goto fail;
 		}
 		rev = (tdb->flags & TDB_CONVERT);