database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

Merge updates from trunk.

Browse Source 
FossilOrigin-Name: ca5f2c545216c82486e66d26f55b49cbf351ffdc
This commit is contained in:
mistachkin
2015-01-12 18:52:57 +00:00
parent 7bb6e8e169 8d9da63dac
commit 9b97b8fed9
20 changed files with 261 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shell.c
View File

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