Index: ext/repair/sqlite3_checker.tcl
==================================================================
--- ext/repair/sqlite3_checker.tcl
+++ ext/repair/sqlite3_checker.tcl
@@ -2,10 +2,25 @@
 # the --tclsh option.
 # This TCL script is the main driver script for the sqlite3_checker utility
 # program.
 #
 
+# Special case:
+#
+#      sqlite3_checker --test FILENAME ARGS
+#
+# uses FILENAME in place of this script.
+#
+if {[lindex $argv 0]=="--test" && [llength $argv]>2} {
+  set file [lindex $argv 1]
+  set argv [lrange $argv 2 end]
+  source $file
+  exit 0
+}
+
+# Emulate a TCL shell
+#
 proc tclsh {} {
   set line {}
   while {![eof stdin]} {
     if {$line!=""} {
       puts -nonewline "> "
@@ -25,18 +40,22 @@
       append line \n
     }
   }
 }
 
+# Print a usage message on standard error, then quit.
+#
 proc usage {} {
   set argv0 [file rootname [file tail [info nameofexecutable]]]
   puts stderr "Usage: $argv0 OPTIONS database-filename"
   puts stderr {
 Do sanity checking on a live SQLite3 database file specified by the
 "database-filename" argument.
 
 Options:
+
+   --freelist   Perform a freelist check
 
    --tclsh      Run the built-in TCL interpreter interactively (for debugging)
 
    --version    Show the version number of SQLite
 }
@@ -43,10 +62,12 @@
   exit 1
 }
 
 set file_to_analyze {}
 append argv {}
+set bFreelistCheck 0
+set bSummary 1
 foreach arg $argv {
   if {[regexp {^-+tclsh$} $arg]} {
     tclsh
     exit 0
   }
@@ -53,10 +74,15 @@
   if {[regexp {^-+version$} $arg]} {
     sqlite3 mem :memory:
     puts [mem one {SELECT sqlite_version()||' '||sqlite_source_id()}]
     mem close
     exit 0
+  }
+  if {[regexp {^-+freelist$} $arg]} {
+    set bFreelistCheck 1
+    set bSummary 0
+    continue
   }
   if {[regexp {^-} $arg]} {
     puts stderr "Unknown option: $arg"
     usage
   }
@@ -84,5 +110,36 @@
 }
 if {![file readable $root_filename]} {
   puts stderr "File is not readable: $root_filename"
   exit 1
 }
+
+if {[catch {sqlite3 db $file_to_analyze} res]} {
+  puts stderr "Cannot open datababase $root_filename: $res"
+  exit 1
+}
+
+if {$bFreelistCheck} {
+  puts "freelist-check:"
+  flush stdout
+  puts [db one {SELECT checkfreelist('main')}]
+}
+if {$bSummary} {
+  set scale 0
+  set pgsz [db one {PRAGMA page_size}]
+  db eval {SELECT nPage*$pgsz AS sz, name, tbl_name
+             FROM sqlite_btreeinfo
+            WHERE type='index'
+            ORDER BY 1 DESC, name} {
+    if {$scale==0} {
+      if {$sz>10000000} {
+        set scale 1000000.0
+        set unit MB
+      } else {
+        set scale 1000.0
+        set unit KB
+      }
+    }
+    puts [format {%7.1f %s index %s of table %s} \
+            [expr {$sz/$scale}] $unit $name $tbl_name]
+  }
+}