Fossil SCM
Handle appendvfs initialization a little differently, in a way that works on windows.
Commit
51c1276ee77755650e3b2c25655d4b98c7be271fe560d4a5fde77ce49af050cd
Parent
517fe07621ae50a…
2 files changed
+4
-2
M
src/db.c
+4
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1092,10 +1092,14 @@ | ||
| 1092 | 1092 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 1093 | 1093 | int rc; |
| 1094 | 1094 | sqlite3 *db; |
| 1095 | 1095 | |
| 1096 | 1096 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 1097 | + if( strcmp(zDbName, g.nameOfExe)==0 ){ | |
| 1098 | + sqlite3_appendvfs_init(0,0,0); | |
| 1099 | + g.zVfsName = "apndvfs"; | |
| 1100 | + } | |
| 1097 | 1101 | rc = sqlite3_open_v2( |
| 1098 | 1102 | zDbName, &db, |
| 1099 | 1103 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 1100 | 1104 | g.zVfsName |
| 1101 | 1105 | ); |
| 1102 | 1106 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1092,10 +1092,14 @@ | |
| 1092 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 1093 | int rc; |
| 1094 | sqlite3 *db; |
| 1095 | |
| 1096 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 1097 | rc = sqlite3_open_v2( |
| 1098 | zDbName, &db, |
| 1099 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 1100 | g.zVfsName |
| 1101 | ); |
| 1102 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1092,10 +1092,14 @@ | |
| 1092 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 1093 | int rc; |
| 1094 | sqlite3 *db; |
| 1095 | |
| 1096 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 1097 | if( strcmp(zDbName, g.nameOfExe)==0 ){ |
| 1098 | sqlite3_appendvfs_init(0,0,0); |
| 1099 | g.zVfsName = "apndvfs"; |
| 1100 | } |
| 1101 | rc = sqlite3_open_v2( |
| 1102 | zDbName, &db, |
| 1103 | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, |
| 1104 | g.zVfsName |
| 1105 | ); |
| 1106 |
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -544,12 +544,10 @@ | ||
| 544 | 544 | */ |
| 545 | 545 | static int fossilExeHasAppendedRepo(void){ |
| 546 | 546 | extern int deduceDatabaseType(const char*,int); |
| 547 | 547 | if( 2==deduceDatabaseType(g.nameOfExe,0) ){ |
| 548 | 548 | static char *azAltArgv[] = { 0, "ui", 0, 0 }; |
| 549 | - sqlite3_appendvfs_init(0,0,0); | |
| 550 | - g.zVfsName = "apndvfs"; | |
| 551 | 549 | azAltArgv[0] = g.nameOfExe; |
| 552 | 550 | azAltArgv[2] = g.nameOfExe; |
| 553 | 551 | g.argv = azAltArgv; |
| 554 | 552 | g.argc = 3; |
| 555 | 553 | return 1; |
| 556 | 554 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -544,12 +544,10 @@ | |
| 544 | */ |
| 545 | static int fossilExeHasAppendedRepo(void){ |
| 546 | extern int deduceDatabaseType(const char*,int); |
| 547 | if( 2==deduceDatabaseType(g.nameOfExe,0) ){ |
| 548 | static char *azAltArgv[] = { 0, "ui", 0, 0 }; |
| 549 | sqlite3_appendvfs_init(0,0,0); |
| 550 | g.zVfsName = "apndvfs"; |
| 551 | azAltArgv[0] = g.nameOfExe; |
| 552 | azAltArgv[2] = g.nameOfExe; |
| 553 | g.argv = azAltArgv; |
| 554 | g.argc = 3; |
| 555 | return 1; |
| 556 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -544,12 +544,10 @@ | |
| 544 | */ |
| 545 | static int fossilExeHasAppendedRepo(void){ |
| 546 | extern int deduceDatabaseType(const char*,int); |
| 547 | if( 2==deduceDatabaseType(g.nameOfExe,0) ){ |
| 548 | static char *azAltArgv[] = { 0, "ui", 0, 0 }; |
| 549 | azAltArgv[0] = g.nameOfExe; |
| 550 | azAltArgv[2] = g.nameOfExe; |
| 551 | g.argv = azAltArgv; |
| 552 | g.argc = 3; |
| 553 | return 1; |
| 554 |