Mistake in help text. Spurious trailing whitespace removed. (CVS 532)

FossilOrigin-Name: 4bdd040e4810565c91bcbb5f065580520c5e3c45

diff --git a/manifest b/manifest
index b05f49d553d886eff0e18517d051d6f7c60a2864..ef3d16f85da780c6311377d47e2c53b5fba4338b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C General:\r\no\sAdded\sglobal\sstatic\schars\smainPrompt\sand\scontinuePrompt.\r\no\sMoved\sArgv0\sdeclaration\sto\shead\sof\sfile.\sNeeded\sin\sdo_meta_command,\r\n\s\spreviously\sfound\sbelow\sthat.\r\no\sAdded\sstruct\sprevious_mode_data\sto\ssupport\snew\s.explain\stoggle\r\n\s\sfunctionality.\r\no\sAdded\snullvalue,\sexplainPrev\sand\soutfile\smembers\sto\r\n\s\sstruct\scallback_data.\r\no\sAdded\smodeDescr\sarray\sfor\snumber/text\stranslation\sofdisplay\smodes.\r\no\sModified\szHelp\sto\smatch\snew\sfunctionality.\r\n\r\ncallback():\r\no\sAdded\ssupport\sfor\s.nullvalue\r\n\r\ndo_meta_command():\r\no\sOutput\sfilename\sis\snow\ssaved\sto\scallback\sstruct.\sIf\susing\sstdout,\r\n\s\sthen\sthe\sstring\s"stdout"\sis\ssaved.\r\no\sExplain\sis\snow\sa\stoggle.\sWhen\sit\sis\sturned\son,\sthe\scurrent\svalues\sof\r\n\s\smode,\sheader\sand\scolWidth\sare\ssaved\sif\snot\salready\sin\sexplain\smode.\r\n\s\sWhen\sturned\soff,\sthose\svalues\sare\srestored.\r\no\sAllow\s.mode\splurals\scolumns\sand\slines\sand\sdot\scommand\splural\r\n\s\s.headers.\r\no\sAdded\sprocessing\sfor\snew\skeywords\s.quit,\s.nullvalue,\s.show,\s.prompt.\r\n\r\nmain():\r\no\sAdded\s-init\sas\san\soption\sto\soverride\s.sqliterc.\r\no\sAdded\s-nullvalue\sas\sa\scommand\sline\soption.\r\no\sProcesses\s.sqliterc.\r\n\r\nmain_init():\r\no\sGenesis.\sMoved\ssome\sinitialization\scode\shere\sfrom\sinside\smain()\sso\r\n\s\sthat\sit\scan\sbe\scalled\sinitially\sby\smain\sand\sagain\sif\s-init\sis\r\n\s\sspecified.\r\n\r\none_input_line():\r\no\sNow\stakes\sprompts\sfrom\ssettable\svalues.\r\n\r\nprocess_sqliterc():\r\no\sGenesis.\sRead\s.sqliterc\sfrom\suser's\shome\sdirectory\sand\spass\sit\sto\r\n\s\sprocess_input().\sFile\sshould\scontain\smeta\scommands\sfor\ssetups.\s(CVS\s531)
-D 2002-04-18T02:46:52
+C Mistake\sin\shelp\stext.\sSpurious\strailing\swhitespace\sremoved.\s(CVS\s532)
+D 2002-04-18T02:53:05
 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d
 F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -39,7 +39,7 @@ F src/parse.y 9a8a2311dd95101bb02b3991042e619eea49729a
 F src/printf.c 300a90554345751f26e1fc0c0333b90a66110a1d
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 92aef3f69e90dc065d680d88b1f075409e9249bb
-F src/shell.c 33e2574f368b86429a4c024904f8b59fb1e85d2d
+F src/shell.c e473e19509c5c9b02bb2fb674be4b223cb052334
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in ffcacf73b5ed1a4939205d29a704a185758fa6a6
 F src/sqliteInt.h e47ca9267a4c4a98e9f8d90c2df994a18f23d699
@@ -131,7 +131,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 33da20b9c1a8eef16ad7ab5929bb8937c75090f2
-R 22639d7fa7e5265cffcc98ada271b214
+P e751338c468cdad79efcc5cd5b924eb2c1eb3c3a
+R 74810d67fb25072226a3268c124de609
 U persicom
-Z 815a973506ea65e8eef7ca2e9e1c8d70
+Z 0a078b1bd6cde4d7fa95da2e64371ee8

diff --git a/manifest.uuid b/manifest.uuid
index 9c8cca465b5d898cbe4fe7e2ede1b199765f4a49..ef022d3dadd4e8669cafb885524f4a1d792c80ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e751338c468cdad79efcc5cd5b924eb2c1eb3c3a
\ No newline at end of file
+4bdd040e4810565c91bcbb5f065580520c5e3c45
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 803c320cd6d3bf9f226862f5f12a15c5aa04dcec..4a753f21d9a7dd1ee30295fb906d53b812cd3df6 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.51 2002/04/18 02:46:52 persicom Exp $
+** $Id: shell.c,v 1.52 2002/04/18 02:53:05 persicom Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -31,7 +31,7 @@
 # include <readline/history.h>
 #else
 # define readline(p) getline(p,stdin)
-# define add_history(X) 
+# define add_history(X)
 #endif
 
 /*
@@ -191,7 +191,7 @@ static int is_numeric(const char *z){
   if( *z=='-' || *z=='+' ){
     z++;
   }
-  while( isdigit(*z) ){ 
+  while( isdigit(*z) ){
     seen_digit = 1;
     z++;
   }
@@ -308,7 +308,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
             if( w<n ) w = n;
           }
           if( i<ArraySize(p->actualWidth) ){
-            p->actualWidth[i] = w; 
+            p->actualWidth[i] = w;
           }
           if( p->showHeader ){
             fprintf(p->out,"%-*.*s%s",w,w,azCol[i], i==nArg-1 ? "\n": "  ");
@@ -398,7 +398,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
       fprintf(p->out,");\n");
       break;
     }
-  }      
+  }
   return 0;
 }
 
@@ -456,7 +456,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     d2.mode = MODE_Insert;
     d2.zDestTable = 0;
     set_table_name(&d2, azArg[0]);
-    sqlite_exec_printf(p->db, 
+    sqlite_exec_printf(p->db,
        "SELECT * FROM '%q'",
        callback, &d2, 0, azArg[0]
     );
@@ -468,7 +468,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
 /*
 ** Text of a help message
 */
-static char zHelp[] = 
+static char zHelp[] =
   ".dump ?TABLE? ...      Dump the database in an text format\n"
   ".echo ON|OFF           Turn command echo on or off\n"
   ".exit                  Exit this program\n"
@@ -488,7 +488,6 @@ static char zHelp[] =
   "                       \"sqlite > \" and \"   ...> \"\n"
   "                       with the strings MAIN and CONTINUE\n"
   "                       CONTINUE is optional.\n"
-  "                       Special characters are:\n"
   ".quit                  Exit this program\n"
   ".read FILENAME         Execute SQL in FILENAME\n"
   ".reindex ?TABLE?       Rebuild indices\n"
@@ -557,7 +556,7 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     }else{
       int i;
       for(i=1; i<nArg && zErrMsg==0; i++){
-        sqlite_exec_printf(db, 
+        sqlite_exec_printf(db,
           "SELECT name, type, sql FROM sqlite_master "
           "WHERE tbl_name LIKE '%q' AND type!='meta' AND sql NOT NULL "
           "ORDER BY substr(type,2,1), name",
@@ -584,7 +583,7 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
       val = 1;
     }else if( strcmp(z,"yes")==0 ){
       val = 1;
-    } 
+    }
     p->echoOn = val;
   }else
 
@@ -648,7 +647,7 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
       val = 1;
     }else if( strcmp(z,"yes")==0 ){
       val = 1;
-    } 
+    }
     p->showHeader = val;
   }else
 
@@ -662,7 +661,7 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     memcpy(&data, p, sizeof(data));
     data.showHeader = 0;
     data.mode = MODE_List;
-    sqlite_exec_printf(db, 
+    sqlite_exec_printf(db,
       "SELECT name FROM sqlite_master "
       "WHERE type='index' AND tbl_name LIKE '%q' "
       "ORDER BY name",
@@ -938,7 +937,7 @@ static void process_input(struct callback_data *p, FILE *in){
     free(zLine);
     if( zSql && sqlite_complete(zSql) ){
       p->cnt = 0;
-      if( sqlite_exec(db, zSql, callback, p, &zErrMsg)!=0 
+      if( sqlite_exec(db, zSql, callback, p, &zErrMsg)!=0
            && zErrMsg!=0 ){
         if( in!=0 && !p->echoOn ) printf("%s\n",zSql);
         printf("SQL error: %s\n", zErrMsg);