Fix typo in the name of a Win32 string conversion routine. Replace several uses...

FossilOrigin-Name: 6fc95dd7a0b44212f30e657a850892a85a12715c

diff --git a/manifest b/manifest
index 1e49e4a711daf0ff41a9533fa02f923866c55635..ad58bc010215e0c47637ed2ac4b4133c0e021155 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sno\sKEY\sis\sspecified\son\sATTACH,\scopy\sthe\smain\sschema\skey\sif\sthe\skey\ssize\nis\snon-zero.\s\sIn\sother\swords,\sallow\sfor\s-1\sas\sa\svalid\skey\ssize\sin\ssupport\nof\sthe\s--textkey\sto\sSEE.
-D 2016-09-16T19:42:47.592
+C Fix\stypo\sin\sthe\sname\sof\sa\sWin32\sstring\sconversion\sroutine.\s\sReplace\sseveral\suses\sof\sraw_printf()\swith\sutf8_printf()\sin\sthe\sshell.
+D 2016-09-16T20:39:21.872
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd
@@ -387,7 +387,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 3c3cf0dc719cd2a32ab5c1e10c26481dd565492e
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 244f9cc5e4662987cd2ef5c22d1b7027560f3425
-F src/shell.c 131978e994157b3925efd6fdf0e0c4ed9ab2cf91
+F src/shell.c b80396d2fadce4681397707e30078bf416e1dec2
 F src/sqlite.h.in 46ed821aeed0ba45559fb15597d9a400083154a2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1525,7 +1525,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e660402e5e654b7f37ad2ce201df5cbb2b9eb9a6
-R 229c67ed88dfee6249671d401c7e5ca7
-U drh
-Z 23da9c0621ec24a2fd4b8d5523827e43
+P 03573887dbf357f8aa54e4a1cd03b82b0ded8139
+R cbd23b2be6d6c200e751cfcfa4ecc2e3
+U mistachkin
+Z d5990f30391f700f012fd4fd2aa1ad1b

diff --git a/manifest.uuid b/manifest.uuid
index 4fa5c6b9b94139acf4577ff02d856d0b0ccb374a..f9b71348c8847cd08e1793ddfe6a295be43e97f9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03573887dbf357f8aa54e4a1cd03b82b0ded8139
\ No newline at end of file
+6fc95dd7a0b44212f30e657a850892a85a12715c
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 1dad6d9c2a798158c778046b866f2c17ed4d0546..732ef628328747357376572c30d3fdb78b83b1be 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -143,6 +143,7 @@
 extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
 extern char *sqlite3_win32_mbcs_to_utf8_v2(const char *, int);
 extern char *sqlite3_win32_utf8_to_mbcs_v2(const char *, int);
+extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
 #endif
 
 /* On Windows, we normally run with output mode of TEXT so that \n characters
@@ -929,7 +930,7 @@ static int shellAuth(
   az[1] = zA2;
   az[2] = zA3;
   az[3] = zA4;
-  raw_printf(p->out, "authorizer: %s", azAction[op]);
+  utf8_printf(p->out, "authorizer: %s", azAction[op]);
   for(i=0; i<4; i++){
     raw_printf(p->out, " ");
     if( az[i] ){
@@ -942,7 +943,7 @@ static int shellAuth(
   return SQLITE_OK;
 }
 #endif
-  
+
 
 /*
 ** This is the callback routine that the shell
@@ -1446,7 +1447,7 @@ static void displayLinuxIoStats(FILE *out){
     for(i=0; i<ArraySize(aTrans); i++){
       int n = (int)strlen(aTrans[i].zPattern);
       if( strncmp(aTrans[i].zPattern, z, n)==0 ){
-        raw_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
+        utf8_printf(out, "%-36s %s", aTrans[i].zDesc, &z[n]);
         break;
       }
     }
@@ -2180,7 +2181,7 @@ static char zHelp[] =
   "                         tcl      TCL list elements\n"
   ".nullvalue STRING      Use STRING in place of NULL values\n"
   ".once FILENAME         Output for the next SQL command only to FILENAME\n"
-  ".open ?-new? ?FILE?    Close existing database and reopen FILE\n"
+  ".open ?--new? ?FILE?   Close existing database and reopen FILE\n"
   "                         The --new starts with an empty file\n"
   ".output ?FILENAME?     Send output to FILENAME or stdout\n"
   ".print STRING...       Print literal STRING\n"
@@ -3204,7 +3205,7 @@ static int optionMatch(const char *zStr, const char *zOpt){
 int shellDeleteFile(const char *zFilename){
   int rc;
 #ifdef _WIN32
-  wchar_t *z = sqlite3_utf8_to_path(zFilename, 0);
+  wchar_t *z = sqlite3_win32_utf8_to_unicode(zFilename);
   rc = _wunlink(z);
   sqlite3_free(z);
 #else
@@ -3380,12 +3381,12 @@ static int do_meta_command(char *zLine, ShellState *p){
       raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
       rc = 2;
     }else if( testcase_glob(azArg[1],zRes)==0 ){
-      raw_printf(stderr,
+      utf8_printf(stderr,
                  "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
                  p->zTestcase, azArg[1], zRes);
       rc = 2;
     }else{
-      raw_printf(stdout, "testcase-%s ok\n", p->zTestcase);
+      utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
       p->nCheck++;
     }
     sqlite3_free(zRes);
@@ -4016,6 +4017,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       }else if( z[0]=='-' ){
         utf8_printf(stderr, "unknown option: %s\n", z);
         rc = 1;
+        goto meta_command_exit;
       }
     }
     /* If a filename is specified, try to open it first */