diff options
| author | drh <drh@noemail.net> | 2004-02-11 10:37:23 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-02-11 10:37:23 +0000 |
| commit | eb8ed70db540f4da50d3959ad6d413362fb0c1e3 (patch) | |
| tree | b4ee874628a6d29da79455b005cd82c6355ec592 /src/shell.c | |
| parent | 7e26d7509419ec076d498ebcf13dcde84c8f16b6 (diff) | |
| download | sqlite-eb8ed70db540f4da50d3959ad6d413362fb0c1e3.tar.gz sqlite-eb8ed70db540f4da50d3959ad6d413362fb0c1e3.zip | |
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
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/shell.c b/src/shell.c index e73b6a3a8..55438e8d6 100644 --- a/src/shell.c +++ b/src/shell.c @@ -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", |