Lines 1-6
Link Here
|
1 |
--- src/sgDb.c.orig 2008-07-14 20:29:41.000000000 +0200 |
1 |
--- src/sgDb.c.orig 2008-07-14 20:29:41.000000000 +0200 |
2 |
+++ src/sgDb.c 2011-05-26 11:04:22.106201692 +0200 |
2 |
+++ src/sgDb.c 2011-11-15 12:00:23.744601663 +0100 |
3 |
@@ -119,14 +119,20 @@ |
3 |
@@ -119,14 +119,39 @@ |
4 |
flag = DB_CREATE; |
4 |
flag = DB_CREATE; |
5 |
if(createdb) |
5 |
if(createdb) |
6 |
flag = flag | DB_TRUNCATE; |
6 |
flag = flag | DB_TRUNCATE; |
Lines 11-16
Link Here
|
11 |
+ NULL, |
11 |
+ NULL, |
12 |
+#endif |
12 |
+#endif |
13 |
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { |
13 |
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { |
|
|
14 |
+ (void) Db->dbp->close(Db->dbp, 0); |
15 |
+ sgLogFatalError("Error db_open: %s", strerror(ret)); |
16 |
+ } |
17 |
+ } else { |
18 |
+ if ((ret = Db->dbp->open(Db->dbp, |
19 |
+#if DB_VERSION_MINOR >= 1 |
20 |
+ NULL, |
21 |
+#endif |
22 |
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { |
23 |
+ sgLogFatalError("Error db_open: %s", strerror(ret)); |
24 |
+ } |
25 |
+ } |
26 |
+#endif |
27 |
+#if DB_VERSION_MAJOR == 5 |
28 |
+ if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){ |
29 |
+ flag = DB_CREATE; |
30 |
+ if(createdb) |
31 |
+ flag = flag | DB_TRUNCATE; |
32 |
+ if ((ret = Db->dbp->open(Db->dbp, |
33 |
+ NULL, |
34 |
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { |
14 |
(void) Db->dbp->close(Db->dbp, 0); |
35 |
(void) Db->dbp->close(Db->dbp, 0); |
15 |
sgLogFatalError("Error db_open: %s", strerror(ret)); |
36 |
sgLogFatalError("Error db_open: %s", strerror(ret)); |
16 |
} |
37 |
} |
Lines 18-26
Link Here
|
18 |
- if ((ret = |
39 |
- if ((ret = |
19 |
- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { |
40 |
- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { |
20 |
+ if ((ret = Db->dbp->open(Db->dbp, |
41 |
+ if ((ret = Db->dbp->open(Db->dbp, |
21 |
+#if DB_VERSION_MINOR >= 1 |
|
|
22 |
+ NULL, |
42 |
+ NULL, |
23 |
+#endif |
|
|
24 |
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { |
43 |
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { |
25 |
sgLogFatalError("Error db_open: %s", strerror(ret)); |
44 |
sgLogFatalError("Error db_open: %s", strerror(ret)); |
26 |
} |
45 |
} |