Fossil SCM

Merge updates from trunk.

mistachkin 2017-05-29 23:14 UTC see merge
Commit 3b3099bdc010c39a3665e67527deac305e3f9082ccf57541df17ee9875130107
Parent 564edc69aa4c5c5…
3 files changed +2 -2 +1 -1 +1 -1
~ src/db.c ~ src/sqlcmd.c ~ src/sqlcmd.c
M src/db.c
+2 -2
--- src/db.c
+++ src/db.c
@@ -1043,11 +1043,11 @@
10431043
10441044
10451045
 /*
10461046
 ** Sets the encryption key for the database, if necessary.
10471047
 */
1048
-void db_set_key(sqlite3 *db, const char *zDbName){
1048
+void db_maybe_set_encryption_key(sqlite3 *db, const char *zDbName){
10491049
 Blob key;
10501050
 blob_init(&key, 0, 0);
10511051
 db_maybe_obtain_encryption_key(zDbName, &key);
10521052
 if( blob_size(&key)>0 ){
10531053
 char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key));
@@ -1073,11 +1073,11 @@
10731073
 g.zVfsName
10741074
 );
10751075
 if( rc!=SQLITE_OK ){
10761076
 db_err("[%s]: %s", zDbName, sqlite3_errmsg(db));
10771077
 }
1078
- db_set_key(db, zDbName);
1078
+ db_maybe_set_encryption_key(db, zDbName);
10791079
 sqlite3_busy_timeout(db, 5000);
10801080
 sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */
10811081
 sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0);
10821082
 sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
10831083
 sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
10841084
--- src/db.c
+++ src/db.c
@@ -1043,11 +1043,11 @@
1043
1044
1045 /*
1046 ** Sets the encryption key for the database, if necessary.
1047 */
1048 void db_set_key(sqlite3 *db, const char *zDbName){
1049 Blob key;
1050 blob_init(&key, 0, 0);
1051 db_maybe_obtain_encryption_key(zDbName, &key);
1052 if( blob_size(&key)>0 ){
1053 char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key));
@@ -1073,11 +1073,11 @@
1073 g.zVfsName
1074 );
1075 if( rc!=SQLITE_OK ){
1076 db_err("[%s]: %s", zDbName, sqlite3_errmsg(db));
1077 }
1078 db_set_key(db, zDbName);
1079 sqlite3_busy_timeout(db, 5000);
1080 sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */
1081 sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0);
1082 sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
1083 sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
1084
--- src/db.c
+++ src/db.c
@@ -1043,11 +1043,11 @@
1043
1044
1045 /*
1046 ** Sets the encryption key for the database, if necessary.
1047 */
1048 void db_maybe_set_encryption_key(sqlite3 *db, const char *zDbName){
1049 Blob key;
1050 blob_init(&key, 0, 0);
1051 db_maybe_obtain_encryption_key(zDbName, &key);
1052 if( blob_size(&key)>0 ){
1053 char *zCmd = sqlite3_mprintf("PRAGMA key(%Q)", blob_str(&key));
@@ -1073,11 +1073,11 @@
1073 g.zVfsName
1074 );
1075 if( rc!=SQLITE_OK ){
1076 db_err("[%s]: %s", zDbName, sqlite3_errmsg(db));
1077 }
1078 db_maybe_set_encryption_key(db, zDbName);
1079 sqlite3_busy_timeout(db, 5000);
1080 sqlite3_wal_autocheckpoint(db, 1); /* Set to checkpoint frequently */
1081 sqlite3_create_function(db, "user", 0, SQLITE_UTF8, 0, db_sql_user, 0, 0);
1082 sqlite3_create_function(db, "cgi", 1, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
1083 sqlite3_create_function(db, "cgi", 2, SQLITE_UTF8, 0, db_sql_cgi, 0, 0);
1084
M src/sqlcmd.c
+1 -1
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151151
 search_sql_setup(db);
152152
 foci_register(db);
153153
 g.repositoryOpen = 1;
154154
 g.db = db;
155155
 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156
- db_set_key(db, g.zRepositoryName);
156
+ db_maybe_set_encryption_key(db, g.zRepositoryName);
157157
 if( g.zLocalDbName ){
158158
 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159159
 g.zLocalDbName);
160160
 sqlite3_exec(db, zSql, 0, 0, 0);
161161
 sqlite3_free(zSql);
162162
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151 search_sql_setup(db);
152 foci_register(db);
153 g.repositoryOpen = 1;
154 g.db = db;
155 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156 db_set_key(db, g.zRepositoryName);
157 if( g.zLocalDbName ){
158 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159 g.zLocalDbName);
160 sqlite3_exec(db, zSql, 0, 0, 0);
161 sqlite3_free(zSql);
162
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151 search_sql_setup(db);
152 foci_register(db);
153 g.repositoryOpen = 1;
154 g.db = db;
155 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156 db_maybe_set_encryption_key(db, g.zRepositoryName);
157 if( g.zLocalDbName ){
158 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159 g.zLocalDbName);
160 sqlite3_exec(db, zSql, 0, 0, 0);
161 sqlite3_free(zSql);
162
M src/sqlcmd.c
+1 -1
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151151
 search_sql_setup(db);
152152
 foci_register(db);
153153
 g.repositoryOpen = 1;
154154
 g.db = db;
155155
 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156
- db_set_key(db, g.zRepositoryName);
156
+ db_maybe_set_encryption_key(db, g.zRepositoryName);
157157
 if( g.zLocalDbName ){
158158
 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159159
 g.zLocalDbName);
160160
 sqlite3_exec(db, zSql, 0, 0, 0);
161161
 sqlite3_free(zSql);
162162
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151 search_sql_setup(db);
152 foci_register(db);
153 g.repositoryOpen = 1;
154 g.db = db;
155 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156 db_set_key(db, g.zRepositoryName);
157 if( g.zLocalDbName ){
158 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159 g.zLocalDbName);
160 sqlite3_exec(db, zSql, 0, 0, 0);
161 sqlite3_free(zSql);
162
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -151,11 +151,11 @@
151 search_sql_setup(db);
152 foci_register(db);
153 g.repositoryOpen = 1;
154 g.db = db;
155 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
156 db_maybe_set_encryption_key(db, g.zRepositoryName);
157 if( g.zLocalDbName ){
158 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
159 g.zLocalDbName);
160 sqlite3_exec(db, zSql, 0, 0, 0);
161 sqlite3_free(zSql);
162

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button