Add comment on CLI ^C fix (because it is a bit subtle.)

FossilOrigin-Name: 19c062f1cd814a33bf9c10928217464cddaea7c3291ff44e605901a86b82a06d

diff --git a/manifest b/manifest
index e232bac86c5edf792940a4f8865da0e0450033e6..47bc9b974aa39b2e266bf663bda2ab5cc0cbff59 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C CLI\sto\scease\sdumping\sback\sto\sOS\sshel\son\s^C.
-D 2023-04-18T22:28:48.172
+C Add\scomment\son\sCLI\s^C\sfix\s(because\sit\sis\sa\sbit\ssubtle.)
+D 2023-04-18T22:53:30.926
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -632,7 +632,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 4054886848b2aaf3d92d28bda9fabff3b5c5c1ffe8511b0dbafcea008d58a66b
-F src/shell.c.in eb273024a60f6d9f56865eeacd83247fd20919d8248ea0127ee54d6f0d6abe91
+F src/shell.c.in 9d5da77007123401da702e8587558edddd520c925f8f561aa7b8d9387e71e096
 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2058,11 +2058,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8b0fe63f873661037351fc1eba6071b98b5c97a0fc8bd8a504a90d047f78bc0d
-R 734cf00e9ab5f48eb416aa4234b55f52
-T *branch * cli-no-dump
-T *sym-cli-no-dump *
-T -sym-trunk *
+P 7b1f635268bd5b093b22f832c3ac9e5d642d1aac5ebc620619be5a24930feb83
+R 94128278c59c8b6776a5748252e83b85
 U larrybr
-Z 0e6d888acccf444ddfa65e448f5f1581
+Z e64ea4c126276298324ed24c1a272560
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2e69b9565b5558e847a06273440b67edfe77259e..bbf885151600f9fc272f40bbf4f9e67419b1d52b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b1f635268bd5b093b22f832c3ac9e5d642d1aac5ebc620619be5a24930feb83
\ No newline at end of file
+19c062f1cd814a33bf9c10928217464cddaea7c3291ff44e605901a86b82a06d
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index b7fa11463d596c89b5315a0b026e9a6521833d2b..8ce845ba4d13c1ccf956131a7a6f5b36eb776f21 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -994,12 +994,14 @@ static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
     fflush(stdout);
     do{
       zResult = local_getline(zPrior, stdin);
+      /* ^C trap creates a false EOF, so let "interrupt" thread catch up. */
       if( zResult==0 ) sqlite3_sleep(50);
     }while( zResult==0 && seenInterrupt>0 );
 #else
     free(zPrior);
     zResult = shell_readline(zPrompt);
     while( zResult==0 ){
+      /* ^C trap creates a false EOF, so let "interrupt" thread catch up. */
       sqlite3_sleep(50);
       if( seenInterrupt==0 ) break;
       zResult = shell_readline("");