Shell command-line parsing enhancements suggested by Mike Hall. (CVS 956)

FossilOrigin-Name: 5656fe48b192dc84cb5977f826ff99d81684791f

diff --git a/manifest b/manifest
index baccd627ce187a12502161a4118c43de69acd283..da872c9754122be87187ef5c94cd817a7ed2d959 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sdeficiencies\sin\ssqlite_complete()\spointed\sout\sby\sR.\sDennis\sCote.\s(CVS\s955)
-D 2003-05-04T17:58:26
+C Shell\scommand-line\sparsing\senhancements\ssuggested\sby\sMike\sHall.\s(CVS\s956)
+D 2003-05-04T18:30:59
 F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -44,7 +44,7 @@ F src/pragma.c 118fe400d71b7fdcc03580d5eab6bb5aa00772a5
 F src/printf.c fc5fdef6e92ad205005263661fe9716f55a49f3e
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 3fe63e3a29df661ba72a67eecd77e8ee82801def
-F src/shell.c c53ff468787109cf178c6b14ecb7a78654018fd1
+F src/shell.c 89a14538b40fbfa15b0ad10b3367aab272bd9f15
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in eec06462cba262c0ee03f38462a18a4bc66dda4e
 F src/sqliteInt.h a3d84942dacaf72fbe1426adfbd37e8cf5f57e97
@@ -54,7 +54,7 @@ F src/test1.c 4596acd9d9f2a49fda0160a8a6dee5bfc7c6c325
 F src/test2.c 5014337d8576b731cce5b5a14bec4f0daf432700
 F src/test3.c 30985ebdfaf3ee1462a9b0652d3efbdc8d9798f5
 F src/threadtest.c d641a5219e718e18a1a80a50eb9bb549f451f42e
-F src/tokenize.c 65b99ca0c4b8bc89f9d4530762288eea7c5bca62
+F src/tokenize.c 2ba93fe10d5f57f0cc20b07417c3244a30c324b3
 F src/trigger.c 8ee811986080de60d9d883ad96daffea82014f27
 F src/update.c dc3b680b4cf2cb6d839950b68d632850746639b9
 F src/util.c 87635cfdfffa056a8d3147719357aa442374f78c
@@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ffde644361e1d8e2a44a235ff23ad3b43d640df2
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P dd57d6ae6a247824e44a6073bc7e73ecb3c500fd
-R afd858f78403413353ccd46911cf14bc
+P 54b33a5ed9f7a89435c2f1395a3177e8c778bb8a
+R 930631e910c36602dc612ec54d800b90
 U drh
-Z 317ec3dddb2f5501f438a98dd3716c3d
+Z d822521ca3d5d75a1584b57c79080393

diff --git a/manifest.uuid b/manifest.uuid
index 209be605fb645eb00a4794a8cb5851d2fc184703..1945cf089ed60b0eb4b3b2a49a50644494268d78 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54b33a5ed9f7a89435c2f1395a3177e8c778bb8a
\ No newline at end of file
+5656fe48b192dc84cb5977f826ff99d81684791f
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 6d261a844c4e1a2ae128664d68432d6abe9f96cd..60c075b3903a7509a8e3b9ecc88076c64d77d6d6 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.76 2003/05/04 07:25:58 jplyon Exp $
+** $Id: shell.c,v 1.77 2003/05/04 18:30:59 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -1134,6 +1134,32 @@ static void process_sqliterc(struct callback_data *p, char *sqliterc_override){
   return;
 }
 
+/*
+** Show available command line options
+*/
+static const char zOptions[] = 
+  "   -init filename       read/process named file\n"
+  "   -echo                print commands before execution\n"
+  "   -[no]header          turn headers on or off\n"
+  "   -column              set output mode to 'column'\n"
+  "   -html                set output mode to HTML\n"
+  "   -line                set output mode to 'line'\n"
+  "   -list                set output mode to 'list'\n"
+  "   -separator 'x'       set output field separator (|)\n"
+  "   -nullvalue 'text'    set text string for NULL values\n"
+  "   -version             show SQLite version\n"
+  "   -help                show this text, also show dot-commands\n"
+;
+static void usage(int showDetail){
+  fprintf(stderr, "Usage: %s [OPTIONS] FILENAME [SQL]\n", Argv0);
+  if( showDetail ){
+    fprintf(stderr, "Options are:\n%s", zOptions);
+  }else{
+    fprintf(stderr, "Use the -help option for additional information\n");
+  }
+  exit(1);
+}
+
 /*
 ** Initialize the state information in data
 */
@@ -1178,11 +1204,7 @@ int main(int argc, char **argv){
       i++;
     }
   }
-  if( i!=argc-1 && i!=argc-2 ){
-    fprintf(stderr,"Usage: %s ?OPTIONS? FILENAME ?SQL?\n", Argv0);
-    exit(1);
-  }
-  data.zDbFilename = argv[i];
+  data.zDbFilename = i<argc ? argv[i] : ":memory:";
   data.out = stdout;
 
   /* Go ahead and open the database file if it already exists.  If the
@@ -1260,13 +1282,21 @@ int main(int argc, char **argv){
       data.echoOn = 1;
       argc--;
       argv++;
+    }else if( strcmp(argv[1],"-version")==0 ){
+      printf("%s\n", sqlite_version);
+      return 1;
+    }else if( strcmp(argv[1],"-help")==0 ){
+      usage(1);
     }else{
       fprintf(stderr,"%s: unknown option: %s\n", Argv0, argv[1]);
+      fprintf(stderr,"Use -help for a list of options.\n");
       return 1;
     }
   }
 
-  if( argc==3 ){
+  if( argc<2 ){
+    usage(0);
+  }else if( argc==3 ){
     /* Run just the command that follows the database name
     */
     if( argv[2][0]=='.' ){

diff --git a/src/tokenize.c b/src/tokenize.c
index 652a96596da867043e1552baf07a77828818efff..66ecae06c232b4e232695961d38c3676675c96cb 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.59 2003/05/04 17:58:26 drh Exp $
+** $Id: tokenize.c,v 1.60 2003/05/04 18:30:59 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -565,7 +565,7 @@ int sqlite_complete(const char *zSql){
   ** next state.
   */
   static const u8 trans[7][8] = {
-                     /* Token:
+                     /* Token:                                                */
      /* State:       **  EXPLAIN  CREATE  TEMP  TRIGGER  END  SEMI  WS  OTHER */
      /* 0   START: */ {       1,      2,    3,       3,   3,    0,  0,     3, },
      /* 1 EXPLAIN: */ {       3,      2,    3,       3,   3,    0,  1,     3, },
@@ -629,10 +629,10 @@ int sqlite_complete(const char *zSql){
         break;
       }
       default: {
-        if( isIdChar[*zSql] ){
+        if( isIdChar[(u8)*zSql] ){
           /* Keywords and unquoted identifiers */
           int nId;
-          for(nId=1; isIdChar[zSql[nId]]; nId++){}
+          for(nId=1; isIdChar[(u8)zSql[nId]]; nId++){}
           switch( *zSql ){
             case 'c': case 'C': {
               if( nId==6 && sqliteStrNICmp(zSql, "create", 6)==0 ){