From: Marcus Boerger <helly@php.net>
Date: Mon, 10 May 2004 01:42:43 +0000 (+0000)
Subject: - Fix problems with c mode
X-Git-Tag: RELEASE_0_1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3988ee2df902c2e9070f5ad198e6c93f5b54c6e3;p=php

- Fix problems with c mode
---

diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index d544c83b8b..a8760eeb86 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -53,6 +53,10 @@ DBA_OPEN_FUNC(db2)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);
 
+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
 	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
 		s ? DB_BTREE : DB_UNKNOWN;
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index cfb8791a38..8d039d4819 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -62,9 +62,13 @@ DBA_OPEN_FUNC(db3)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);
 
-	type =  info->mode == DBA_READER ? DB_UNKNOWN :
+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
+	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		s? DB_BTREE : DB_UNKNOWN;
+		s ? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
 		(info->mode == DBA_CREAT && s) ? DB_CREATE : 
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index 7059f5eee0..34e2af1a1f 100644
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@@ -63,9 +63,13 @@ DBA_OPEN_FUNC(db4)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);
 
-	type =  info->mode == DBA_READER ? DB_UNKNOWN :
+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
+	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		s? DB_BTREE : DB_UNKNOWN;
+		s ? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
 		(info->mode == DBA_CREAT && s) ? DB_CREATE :