diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/shell.c | 12 | ||||
| -rw-r--r-- | src/tclsqlite.c | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/shell.c b/src/shell.c index 0dbd157ef..cfa2e981e 100644 --- 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.146 2006/08/19 11:15:20 drh Exp $ +** $Id: shell.c,v 1.147 2006/08/29 12:04:19 drh Exp $ */ #include <stdlib.h> #include <string.h> @@ -1653,12 +1653,14 @@ static const char zOptions[] = " -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); + fprintf(stderr, + "Usage: %s [OPTIONS] FILENAME [SQL]\n" + "FILENAME is the name of an SQLite database. A new database is created\n" + "if the file does not previously exist.\n", Argv0); if( showDetail ){ - fprintf(stderr, "Options are:\n%s", zOptions); + fprintf(stderr, "OPTIONS include:\n%s", zOptions); }else{ fprintf(stderr, "Use the -help option for additional information\n"); } @@ -1782,7 +1784,7 @@ int main(int argc, char **argv){ }else if( strcmp(z,"-version")==0 ){ printf("%s\n", sqlite3_libversion()); return 0; - }else if( strcmp(z,"-help")==0 ){ + }else if( strcmp(z,"-help")==0 || strcmp(z, "--help")==0 ){ usage(1); }else{ fprintf(stderr,"%s: unknown option: %s\n", Argv0, z); diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 622208378..0de5a6fd3 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.170 2006/08/25 23:42:53 drh Exp $ +** $Id: tclsqlite.c,v 1.171 2006/08/29 12:04:19 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -2073,6 +2073,13 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ zArg = Tcl_GetStringFromObj(objv[1], 0); Tcl_CreateObjCommand(interp, zArg, DbObjCmd, (char*)p, DbDeleteCmd); +#ifdef SQLITE_ENABLE_FTS1 + { + extern int fulltext_init(sqlite3*); + fulltext_init(p->db); + } +#endif + /* If compiled with SQLITE_TEST turned on, then register the "md5sum" ** SQL function. */ |