database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Refinements to the previous check-in.

Browse Source 
FossilOrigin-Name: b36dfdff787dc4a107b2c3fcbb98bfc4922872d8
This commit is contained in:
mistachkin
2016-04-04 02:33:34 +00:00
parent 1fe36bb8a8
commit 1810f22809
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Experimental\schanges\sto\sthe\scommand\sline\sshell\sto\smake\sit\swork\sbetter\swith\sUnicode\son\sWindows. C Refinements\sto\sthe\sprevious\scheck-in.
D 2016-04-04T02:16:44.372 D 2016-04-04T02:33:34.200
F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
@@ -374,7 +374,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20 F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143 F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143
F src/shell.c cfe5edc196c7ab109b6ea728a69dc9346e03f4f7 F src/shell.c ba8974732ad24dc8bffc9d9dae8a729edaf45b0d
F src/sqlite.h.in c46a7b85d3f37371cacea8f98ec825f5e52c420c F src/sqlite.h.in c46a7b85d3f37371cacea8f98ec825f5e52c420c
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
@@ -1049,7 +1049,7 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506 F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
F test/shell1.test 95b172b3854413a566e1e16da0a9aeae25966f4c F test/shell1.test b110f092f64193c7235abd07bab79f1a59f494b1
F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b
F test/shell3.test da513d522ef6f01cee8475dcf8332bff8982b3dd F test/shell3.test da513d522ef6f01cee8475dcf8332bff8982b3dd
F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9 F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
@@ -1480,7 +1480,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 02ccb444a3d0b9a52ffd04cae9d9b6f654128c35 P 74183a5f803999e1d4e288851c72519c3c53f6b5
R 12b05bab5737c52c6e35683f2e505d88 R dc99ab499cebc95aed1812a7f9308be8
U mistachkin U mistachkin
Z 02f8d2df1ede1dbca37f29a3d0ba1aa0 Z 71f87a99a345de92d46f0c5169631d32

2
manifest.uuid
View File

@@ -1 +1 @@
74183a5f803999e1d4e288851c72519c3c53f6b5 b36dfdff787dc4a107b2c3fcbb98bfc4922872d8

7
src/shell.c
View File

@@ -4999,7 +4999,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){
int SQLITE_CDECL main(int argc, char **argv){ int SQLITE_CDECL main(int argc, char **argv){
#else #else
int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
char **argv = 0; char **argv;
#endif #endif
char *zErrMsg = 0; char *zErrMsg = 0;
ShellState data; ShellState data;
@@ -5013,6 +5013,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
setBinaryMode(stdin, 0); setBinaryMode(stdin, 0);
setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */ setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
stdin_is_interactive = isatty(0);
stdout_is_console = isatty(1);
#if USE_SYSTEM_SQLITE+0!=1 #if USE_SYSTEM_SQLITE+0!=1
if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){ if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
@@ -5037,9 +5039,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
} }
} }
#endif #endif
assert( argc>=1 && argv && argv[0] );
Argv0 = argv[0]; Argv0 = argv[0];
stdin_is_interactive = isatty(0);
stdout_is_console = isatty(1);
/* Make sure we have a valid signal handler early, before anything /* Make sure we have a valid signal handler early, before anything
** else is done. ** else is done.

4
test/shell1.test
View File

@@ -911,7 +911,7 @@ do_test shell1-5.0 {
} {} } {}
do_test shell1-6.0 { do_test shell1-6.0 {
# The file name here is the word "test" in Chinese. # The base file name here is the word "test" in Chinese.
# In UTF-8, it is encoded as: \xE6\xB5\x8B\xE8\xAF\x95 # In UTF-8, it is encoded as: \xE6\xB5\x8B\xE8\xAF\x95
set fileName \u6D4B\u8BD5; append fileName .db set fileName \u6D4B\u8BD5; append fileName .db
set x [catchcmdex $fileName "CREATE TABLE t1(x);\n.schema\n"] set x [catchcmdex $fileName "CREATE TABLE t1(x);\n.schema\n"]
@@ -924,7 +924,7 @@ do_test shell1-6.0 {
error "failed with mismatch: $res" error "failed with mismatch: $res"
} }
if {![file exists $fileName]} { if {![file exists $fileName]} {
error "file \"$fileName\" (MBCS) does not exist" error "file \"$fileName\" (Unicode) does not exist"
} }
forcedelete $fileName forcedelete $fileName
} {} } {}