1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00

Fix the shells so that they always enable the codec if it is available,

even if no key is supplied. (CVS 1226)

FossilOrigin-Name: 95989717e17d52b2306374f5cf7613c3bd4e7801
This commit is contained in:
drh
2004-02-11 10:37:23 +00:00
parent 7e26d75094
commit eb8ed70db5
4 changed files with 17 additions and 19 deletions

View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.86 2004/02/11 02:18:07 drh Exp $
** $Id: shell.c,v 1.87 2004/02/11 10:37:23 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@@ -512,12 +512,11 @@ static void open_db(struct callback_data *p){
if( p->db==0 ){
char *zErrMsg = 0;
#ifdef SQLITE_HAS_CODEC
if( p->zKey && p->zKey[0] ){
int n = strlen(p->zKey);
p->db = sqlite_open_encrypted(p->zDbFilename, p->zKey, n, &zErrMsg);
}else
#endif
int n = p->zKey ? strlen(p->zKey) : 0;
p->db = sqlite_open_encrypted(p->zDbFilename, p->zKey, n, &zErrMsg);
#else
p->db = sqlite_open(p->zDbFilename, 0, &zErrMsg);
#endif
if( p->db==0 ){
if( zErrMsg ){
fprintf(stderr,"Unable to open database \"%s\": %s\n",