Changes to support compiling under windows. (CVS 1925)

FossilOrigin-Name: 68a712f3728587ee20f6f15900e9826eeeaaa0de

diff --git a/manifest b/manifest
index c10295f48fc43add6787437dfb67b99cf36dbeb4..0c043a3b21dc348f7400cf65082e08abb0fafbe0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplifications\sand\soptimizations.\s\sAlso:\sdisable\sthe\scorrupt.test\sfor\snow.\s(CVS\s1924)
-D 2004-08-31T13:45:11
+C Changes\sto\ssupport\scompiling\sunder\swindows.\s(CVS\s1925)
+D 2004-08-31T23:41:26
 F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -24,7 +24,7 @@ F publish.sh 72bde067dda3fc2d33e92f20253b924e3b97da30
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
-F sqlite3.def cf325d366f167029a971de7333f32b74bfe2e375
+F sqlite3.def 84215604aa7b547d75e0f7b437966e7ad18fa8b2
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/attach.c 0bd4f11da6999665da30625665a4096ba7898de6
 F src/auth.c 60db23b98bb94c8b0178180faaf49dc116674217
@@ -59,7 +59,7 @@ F src/pragma.c b39177b96bb5f7354511468c933357ce65a0dd4c
 F src/printf.c 17b28a1eedfe8129b05de981719306c18c3f1327
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 400b2dcc8e05c0101a65a370f7ebb33c9c85f0b3
-F src/shell.c 64932b37d79baffd34544172c14c99b2e08a11bb
+F src/shell.c 4f1a2760ced81c829defb47b0a3b61ffec61b604
 F src/sqlite.h.in b89ced1acc705bc9c79a2a4e725ac0eb64bd0614
 F src/sqliteInt.h 89c1555ceba68d460ee13530eb8a51944e57fad2
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
@@ -246,7 +246,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 0a47c8f86d1649e9ae7edd4c49a6fe5f5272351e
-R 4e22239c77e5e5c0b57b87eb76489528
+P 8fd65e704888a8e2f4a712a94fd0e3f866c10ef3
+R 0d8f5ad503e5312e676ca00f78eae116
 U drh
-Z 972ff5a80d13e0bb73eb2d8433c24b81
+Z 56bb610aa487540418fc40b7a4941024

diff --git a/manifest.uuid b/manifest.uuid
index 564fa734d6a6a50fd90d36cd737a62df9c0ea853..9cc7c2f3f185cb0db7a255e75aadb14b8138349c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8fd65e704888a8e2f4a712a94fd0e3f866c10ef3
\ No newline at end of file
+68a712f3728587ee20f6f15900e9826eeeaaa0de
\ No newline at end of file

diff --git a/sqlite3.def b/sqlite3.def
index 3a17a9a87ac353b3ac335559a5f3d760de434995..c3cba03b6225413dcaf4ee6b44ac1bdc625fc1b7 100644 (file)
--- a/sqlite3.def
+++ b/sqlite3.def
@@ -70,6 +70,7 @@ sqlite3_result_text16le
 sqlite3_result_value
 sqlite3_set_authorizer
 sqlite3_set_auxdata
+sqlite3_snprintf
 sqlite3_step
 sqlite3_total_changes
 sqlite3_trace

diff --git a/src/shell.c b/src/shell.c
index f1b4dac2725d9596afbd69d7d02e6ad05a7e0722..592536034896b5594ea49c9c5618d9da2b5bc757 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.112 2004/08/30 01:54:05 drh Exp $
+** $Id: shell.c,v 1.113 2004/08/31 23:41:26 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -81,7 +81,29 @@ static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
 /*
 ** Determines if a string is a number of not.
 */
-extern int sqlite3IsNumber(const char*, int*, unsigned char);
+static int isNumber(const unsigned char *z, int *realnum){
+  if( *z=='-' || *z=='+' ) z++;
+  if( !isdigit(*z) ){
+    return 0;
+  }
+  z++;
+  if( realnum ) *realnum = 0;
+  while( isdigit(*z) ){ z++; }
+  if( *z=='.' ){
+    z++;
+    if( !isdigit(*z) ) return 0;
+    while( isdigit(*z) ){ z++; }
+    if( realnum ) *realnum = 1;
+  }
+  if( *z=='e' || *z=='E' ){
+    z++;
+    if( *z=='+' || *z=='-' ) z++;
+    if( !isdigit(*z) ) return 0;
+    while( isdigit(*z) ){ z++; }
+    if( realnum ) *realnum = 1;
+  }
+  return *z==0;
+}
 
 /*
 ** A global char* and an SQL function to access its current value 
@@ -459,7 +481,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
         char *zSep = i>0 ? ",": "";
         if( azArg[i]==0 ){
           fprintf(p->out,"%sNULL",zSep);
-        }else if( sqlite3IsNumber(azArg[i], 0, 1) ){
+        }else if( isNumber(azArg[i], 0) ){
           fprintf(p->out,"%s%s",zSep, azArg[i]);
         }else{
           if( zSep[0] ) fprintf(p->out,"%s",zSep);
@@ -1179,8 +1201,9 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     data.showHeader = 0;
     data.mode = MODE_Semi;
     if( nArg>1 ){
-      extern int sqlite3StrICmp(const char*,const char*);
-      if( sqlite3StrICmp(azArg[1],"sqlite_master")==0 ){
+      int i;
+      for(i=0; azArg[1][i]; i++) azArg[1][i] = tolower(azArg[1][i]);
+      if( strcmp(azArg[1],"sqlite_master")==0 ){
         char *new_argv[2], *new_colv[2];
         new_argv[0] = "CREATE TABLE sqlite_master (\n"
                       "  type text,\n"
@@ -1193,7 +1216,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         new_colv[0] = "sql";
         new_colv[1] = 0;
         callback(&data, 1, new_argv, new_colv);
-      }else if( sqlite3StrICmp(azArg[1],"sqlite_temp_master")==0 ){
+      }else if( strcmp(azArg[1],"sqlite_temp_master")==0 ){
         char *new_argv[2], *new_colv[2];
         new_argv[0] = "CREATE TEMP TABLE sqlite_temp_master (\n"
                       "  type text,\n"
@@ -1372,10 +1395,10 @@ static int _all_whitespace(const char *z){
 ** as is the Oracle "/".
 */
 static int _is_command_terminator(const char *zLine){
-  extern int sqlite3StrNICmp(const char*,const char*,int);
   while( isspace(*(unsigned char*)zLine) ){ zLine++; };
   if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ) return 1;  /* Oracle */
-  if( sqlite3StrNICmp(zLine,"go",2)==0 && _all_whitespace(&zLine[2]) ){
+  if( tolower(zLine[0])=='g' && tolower(zLine[1])=='o'
+         && _all_whitespace(&zLine[2]) ){
     return 1;  /* SQL Server */
   }
   return 0;
@@ -1585,7 +1608,6 @@ int main(int argc, char **argv){
   const char *zInitFile = 0;
   char *zFirstCmd = 0;
   int i;
-  extern int sqlite3OsFileExists(const char*);
 
 #ifdef __MACOS__
   argc = ccommand(&argv);
@@ -1632,7 +1654,7 @@ int main(int argc, char **argv){
   ** files from being created if a user mistypes the database name argument
   ** to the sqlite command-line tool.
   */
-  if( sqlite3OsFileExists(data.zDbFilename) ){
+  if( access(data.zDbFilename, 0)==0 ){
     open_db(&data);
   }
 
@@ -1672,7 +1694,7 @@ int main(int argc, char **argv){
     }else if( strcmp(z,"-echo")==0 ){
       data.echoOn = 1;
     }else if( strcmp(z,"-version")==0 ){
-      printf("%s\n", sqlite3_version);
+      printf("%s\n", sqlite3_libversion());
       return 1;
     }else if( strcmp(z,"-help")==0 ){
       usage(1);
@@ -1707,7 +1729,7 @@ int main(int argc, char **argv){
       printf(
         "SQLite version %s\n"
         "Enter \".help\" for instructions\n",
-        sqlite3_version
+        sqlite3_libversion()
       );
       zHome = find_home_dir();
       if( zHome && (zHistory = malloc(strlen(zHome)+20))!=0 ){