database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Fixes to the "editline" support in the command-line shell.

Browse Source 
FossilOrigin-Name: 7989ce5f105657060a39be295255da8eff9ed56e
This commit is contained in:
drh
2014-02-11 14:37:51 +00:00
parent 7c3280649a
commit aaa21b41e8
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Make\ssure\sthat\svirtual\sWHERE-clause\sterms\sdo\snot\sget\stransformed\sinto\sreal\nterms\swhen\sprocessing\sset\sof\sOR-connected\sterms.\nFix\sfor\sticket\s[4c86b126f22ad]. C Fixes\sto\sthe\s"editline"\ssupport\sin\sthe\scommand-line\sshell.
D 2014-02-11T01:50:29.864 D 2014-02-11T14:37:51.706
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -220,7 +220,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
F src/select.c 50961f0d0ab8f2d45ff29ec5f91d8db221330ca7 F src/select.c 50961f0d0ab8f2d45ff29ec5f91d8db221330ca7
F src/shell.c 7dedf7367ee49050b0366bf8dbc8ec2bd15b42c7 F src/shell.c b1f75cfcd05b7921d74361f1cb9c01b9ca0b13df
F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1153,7 +1153,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 9367632dd7e4fec9197227e35b0627c2e81ebffc P c950d6c4117d076f871518e738cdf9e8c46a19fc
R c0a7ad49332334bf360852ac9acfe6b0 R c9ba63de227fe5f3c297f7ef3cdd12e1
U drh U drh
Z c0afcb3ac05ab221eadb28aadee413b3 Z ef37a62508215b02b96d545bd9d80c32

2
manifest.uuid
View File

@@ -1 +1 @@
c950d6c4117d076f871518e738cdf9e8c46a19fc 7989ce5f105657060a39be295255da8eff9ed56e

17
src/shell.c
View File

@@ -45,14 +45,17 @@
# include <sys/types.h> # include <sys/types.h>
#endif #endif
#ifdef HAVE_EDITLINE #if defined(HAVE_READLINE) && HAVE_READLINE!=0
# include <editline/editline.h>
#endif
#if defined(HAVE_READLINE) && HAVE_READLINE==1
# include <readline/readline.h> # include <readline/readline.h>
# include <readline/history.h> # include <readline/history.h>
#else
# undef HAVE_READLINE
#endif #endif
#if !defined(HAVE_EDITLINE) && (!defined(HAVE_READLINE) || HAVE_READLINE!=1) #if defined(HAVE_EDITLINE) && !defined(HAVE_READLINE)
# define HAVE_READLINE 1
# include <editline/readline.h>
#endif
#if !defined(HAVE_READLINE)
# define add_history(X) # define add_history(X)
# define read_history(X) # define read_history(X)
# define write_history(X) # define write_history(X)
@@ -413,7 +416,7 @@ static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
zResult = local_getline(zPrior, in); zResult = local_getline(zPrior, in);
}else{ }else{
zPrompt = isContinuation ? continuePrompt : mainPrompt; zPrompt = isContinuation ? continuePrompt : mainPrompt;
#if defined(HAVE_READLINE) && HAVE_READLINE==1 #if defined(HAVE_READLINE)
free(zPrior); free(zPrior);
zResult = readline(zPrompt); zResult = readline(zPrompt);
if( zResult && *zResult ) add_history(zResult); if( zResult && *zResult ) add_history(zResult);
@@ -3761,7 +3764,7 @@ int main(int argc, char **argv){
sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome); sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
} }
} }
#if defined(HAVE_READLINE) && HAVE_READLINE==1 #if defined(HAVE_READLINE)
if( zHistory ) read_history(zHistory); if( zHistory ) read_history(zHistory);
#endif #endif
rc = process_input(&data, 0); rc = process_input(&data, 0);