Updated to match new shell.c functionality. (CVS 533)

FossilOrigin-Name: ff67ad40106a20fb85797cca4c495dc34ad5519b

diff --git a/manifest b/manifest
index ef3d16f85da780c6311377d47e2c53b5fba4338b..40172c5dcf7b06416c937adfc81baeb7f98d01fc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mistake\sin\shelp\stext.\sSpurious\strailing\swhitespace\sremoved.\s(CVS\s532)
-D 2002-04-18T02:53:05
+C Updated\sto\smatch\snew\sshell.c\sfunctionality.\s(CVS\s533)
+D 2002-04-18T02:53:54
 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d
 F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -18,7 +18,7 @@ F libtool c56e618713c9510a103bda6b95f3ea3900dcacd6
 F ltmain.sh e9ed72eb1d690f447c13945eaf69e28af531eda1
 F publish.sh 0b9da5898bf5997f30d6f80de4880072db7e5718
 F spec.template 238f7db425a78dc1bb7682e56e3834c7270a3f5e
-F sqlite.1 2e2bb0529ef468ade9e4322bd609d0695fb9ded9
+F sqlite.1 6b339cb747b45f8e7ea0335b06291b6d52067b31
 F src/TODO af7f3cab0228e34149cf98e073aa83d45878e7e6
 F src/btree.c 7dd7ddc66459982dd0cb9800958c1f8d65a32d9f
 F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
@@ -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 e751338c468cdad79efcc5cd5b924eb2c1eb3c3a
-R 74810d67fb25072226a3268c124de609
+P 4bdd040e4810565c91bcbb5f065580520c5e3c45
+R fccec3c1f56efdafc771baab879ce3fe
 U persicom
-Z 0a078b1bd6cde4d7fa95da2e64371ee8
+Z f4c9300a9a77dcec47079904c2bfe5db

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

diff --git a/sqlite.1 b/sqlite.1
index 31f4b1ca1ff6cbe55d27e6a3a2ce897d3656cc12..1f86cfb8b0b2a42bb1865cf842e2c5328d9429ce 100644 (file)
--- a/sqlite.1
+++ b/sqlite.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH SQLITE SECTION "January 2, 2002"
+.TH SQLITE 1 "Mon Apr 15 23:49:17 2002"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -73,19 +73,39 @@ any time. For example:
 .nf
 .cc |
 sqlite> .help
-.dump                  Dump database in a text format
+.dump ?TABLE? ...      Dump the database in an text format
+.echo ON|OFF           Turn command echo on or off
 .exit                  Exit this program
-.explain               Set output mode suitable for EXPLAIN
-.header ON|OFF         Turn display of headers on or off
+.explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.
+                       "off" will revert to the output mode that was
+                       previously in effect
+.header(s) ON|OFF      Turn display of headers on or off
 .help                  Show this message
 .indices TABLE         Show names of all indices on TABLE
-.mode MODE             Set mode to one of "line", "column", "list", or "html"
+.mode MODE             Set mode to one of "line(s)", "column(s)",
+                       "insert", "list", or "html"
 .mode insert TABLE     Generate SQL insert statements for TABLE
+.nullvalue STRING      Print STRING instead of nothing for NULL data
 .output FILENAME       Send output to FILENAME
 .output stdout         Send output to the screen
+.prompt MAIN CONTINUE  Replace the standard prompts
+                       "sqlite > " and "   ...> "
+                       with the strings MAIN and CONTINUE
+                       CONTINUE is optional.
+.quit                  Exit this program
+.read FILENAME         Execute SQL in FILENAME
+.reindex ?TABLE?       Rebuild indices
 .schema ?TABLE?        Show the CREATE statements
 .separator STRING      Change separator string for "list" mode
-.tables                List names all tables in the database
+.show                  Show the current values for the following:
+                       .echo
+                       .explain
+                       .mode
+                       .nullvalue
+                       .output
+                       .separator
+                       .width
+.tables ?PATTERN?      List names of tables matching a pattern
 .timeout MS            Try opening locked tables for MS milliseconds
 .width NUM NUM ...     Set column widths for "column" mode
 sqlite>
@@ -96,6 +116,10 @@ sqlite>
 .SH OPTIONS
 The program has the following options:
 .TP
+.BI \-init\ file
+Read in and process 'file', which contains "dot commands".
+You can use this file to initialize display settings.
+.TP
 .B \-html
 Set output mode to HTML.
 .TP
@@ -105,9 +129,22 @@ Set output mode to 'list'.
 .B \-line
 Set output mode to 'line'.
 .TP
+.B \-column
+Set output mode to 'column'.
+.TP
 .BI \-seperator\  seperator
-Specify which output field seperator for 'list' mode to use. 
+Specify which output field seperator for 'list' mode to use.
 Default is '|'.
+.TP
+.BI \-nullvalue\  string
+When a null is encountered, print 'string'. Default is no string.
+.TP
+.B \-[no]header
+Turn headers on or off. Default is off.
+.TP
+.B \-echo
+Print commands before execution.
+
 
 .SH OUTPUT MODE
 The SQLite program has different output modes, which define the way
@@ -124,6 +161,38 @@ In HTML mode, an XHTML table is generated.
 
 In 'column' mode, one record per line is output, aligned neatly in colums.
 
+.SH INIT FILE
+sqlite can be initialized using resource files. These can be combined with
+command line arguments to set up sqlite exactly the way you want it.
+Initialization proceeds as follows:
+
+o The defaults of
+
+.sp
+.nf
+.cc |
+mode            = LIST
+separator       = "|"
+main prompt     = "sqlite> "
+continue prompt = "   ...> "
+|cc .
+.sp
+.fi
+
+are established.
+
+o If a file .sqliterc can be found in the user's home directory, it is
+read and processed. It should only contain "dot commands".  If the
+file is not found or cannot be read, processing continues without
+notification.
+
+o If a file is specified on the command line with the -init option, it
+is processed in the same manner as .sqliterc
+
+o All other command line options are processed
+
+o The database is opened and you are now ready to begin.
+
 .SH SEE ALSO
 http://www.hwaci.com/sw/sqlite/
 .br