Modification to shell.c to avoid a compiler warning on some compilers. (CVS 2268)

FossilOrigin-Name: 0778383b6f9e6f58202ca20e74b399f8dce90ec4

diff --git a/manifest b/manifest
index f3753101b71757d9d3fa00a7ca6ed12bb146feb1..8bd6c7ad54c5ce3e90de3b97c3c5f4ac7bbdb044 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schanges\sto\savoid\swarnings\son\ssome\scompilers.\s(CVS\s2267)
-D 2005-01-23T22:41:37
+C Modification\sto\sshell.c\sto\savoid\sa\scompiler\swarning\son\ssome\scompilers.\s(CVS\s2268)
+D 2005-01-23T23:43:22
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -59,7 +59,7 @@ F src/pragma.c 141a3f4985b76035d102dc7ca37be6b04cfb8376
 F src/printf.c 3d20b21cfecadacecac3fb7274e746cb81d3d357
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c e204ca5292751ed889f2cbcf2d2808a4d29edd2c
-F src/shell.c 591364a0e9ca4ce53873e21e0294476c0c2b4770
+F src/shell.c 1f0da77ef0520afd6df71f4781076021874310f3
 F src/sqlite.h.in 7d7c28344e2bd770491b56ed9169be20859c707d
 F src/sqliteInt.h be6fa5e31c65e2b8e10112ee47a6e63ec7de37b5
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
@@ -271,7 +271,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 1a64295e055d083539e05f069df6f1bea12e14b2
-R d8849dc8719dcdd857520d8fcc0fa116
+P 4daf1d1f9d4d32397d785d660394c5579c296b1f
+R 8df86275dd33cf0b616f418209c56803
 U danielk1977
-Z b4da30a39691547fb689e1e570bb8249
+Z d19cfe2e48a816a764328ffd26ac041f

diff --git a/manifest.uuid b/manifest.uuid
index 15d3c7bd6cc112f42dbabd3ab3c5e470b2d1eeaf..f8fa4ed5f3c1f2c8145e76176f29c34c044cc727 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4daf1d1f9d4d32397d785d660394c5579c296b1f
\ No newline at end of file
+0778383b6f9e6f58202ca20e74b399f8dce90ec4
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index ae0f90b722896b3af51abaeef7ace25ec7c3644d..99cb6221609dacd5b10345ff587f5aa27a96914d 100644 (file)
--- 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.119 2005/01/13 11:10:25 danielk1977 Exp $
+** $Id: shell.c,v 1.120 2005/01/23 23:43:22 danielk1977 Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -196,7 +196,9 @@ static char *one_input_line(const char *zPrior, FILE *in){
     zPrompt = mainPrompt;
   }
   zResult = readline(zPrompt);
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
   if( zResult ) add_history(zResult);
+#endif
   return zResult;
 }
 
@@ -360,6 +362,7 @@ static void output_csv(struct callback_data *p, const char *z, int bSep){
   }
 }
 
+#ifdef SIGINT
 /*
 ** This routine runs when the user presses Ctrl-C
 */
@@ -367,6 +370,7 @@ static void interrupt_handler(int NotUsed){
   seenInterrupt = 1;
   if( db ) sqlite3_interrupt(db);
 }
+#endif
 
 /*
 ** This is the callback routine that the SQLite library
@@ -1775,7 +1779,9 @@ int main(int argc, char **argv){
       if( zHome && (zHistory = malloc(strlen(zHome)+20))!=0 ){
         sprintf(zHistory,"%s/.sqlite_history", zHome);
       }
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
       if( zHistory ) read_history(zHistory);
+#endif
       process_input(&data, 0);
       if( zHistory ){
         stifle_history(100);