Fix minor issues on Windows.

FossilOrigin-Name: 48e40d3f6a193d6c4d1b8deda36415a690602dbe33d49984a9d92c6d40d8da5c

diff --git a/manifest b/manifest
index 7f18f4eedc0700be8b8b0d3064282758a1dd9971..259f648d1b2253ab4ba157f1cbd4ab65cf28e8b0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sprompt\sfor\sin-memory\sdatabases.\s\sFix\sthe\scontinuation\smechanism\sso\sthat\nit\slooks\sat\sall\saccumulated\slines,\snot\sjust\sthe\smost\srecent\sline.
-D 2026-04-10T20:29:35.946
+C Fix\sminor\sissues\son\sWindows.
+D 2026-04-10T20:44:38.547
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -735,7 +735,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
-F src/shell.c.in 335a0c427f7de16a574c40683e79f9d5e7efcd2764168b00f7bdf76dfa349818
+F src/shell.c.in c36f64a3edfbf57d495570a3140aeba475f1982a3b25fad38e7dc96d6fd08c88
 F src/sqlite.h.in a5605faa9479bbaac16c4ab43eb09ff50632004a8e05084d3fde56063ef73766
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
@@ -2197,8 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 052631202e4dd930d93434b7003e73b23557934421ace5d2f382f041638d5518
-R db2a870af126f19369636d4e3aa1216f
+P 166894725569cafa96c434aa14db0428db6791a8296fcc2990bec4ec819fd876
+R 2c75543b21d9df41c96d37c1e2521622
 U drh
-Z af6eb6bd5da5f6fa8530eefe13136eb2
+Z 9488bb6f8a2bd1c8cd9ed25f04693ceb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 538f1770ec30fc0a14d7e84d7ecd4af5437f9725..2b3a4a77358e9153e411919b42e1502fe9e5be28 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-166894725569cafa96c434aa14db0428db6791a8296fcc2990bec4ec819fd876
+48e40d3f6a193d6c4d1b8deda36415a690602dbe33d49984a9d92c6d40d8da5c

diff --git a/src/shell.c.in b/src/shell.c.in
index 3b8731f7c51ce51d6a5d84fae9039bcdc1a772a3..b9202602b5a866d963b7af389ce16c3cac7428cc 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1024,7 +1024,11 @@ static char *expand_prompt(
         if( zFN ){
           if( zFN[0]==0 ) zFN = "in-memory";
           if( c=='f' ){
+#ifdef _WIN32
+            const char *zTail = strrchr(zFN,'\\');
+#else
             const char *zTail = strrchr(zFN,'/');
+#endif
             if( zTail && zTail[1] ) zFN = &zTail[1];
           }else if( c=='~' ){
             const char *zHOME = getenv("HOME");
@@ -1046,17 +1050,17 @@ static char *expand_prompt(
       /* \H becomes text needed to terminate current input */
       if( onoff ){
         sqlite3_int64 R = zPrior ? sqlite3_incomplete(zPrior) : 0;
-        int c = (R>>16)&0xff;
+        int cc = (R>>16)&0xff;
         int nParen = R>>32;
         int eSemi = (R>>8)&0xff;
-        if( c==0 ){
+        if( cc==0 ){
           /* no-op */
-        }else if( c=='-' ){
+        }else if( cc=='-' ){
           sqlite3_str_append(pOut,"\\n",3);
-        }else if( c=='/' ){
+        }else if( cc=='/' ){
           sqlite3_str_append(pOut,"*/",2);
         }else{
-          sqlite3_str_appendchar(pOut, 1, c);
+          sqlite3_str_appendchar(pOut, 1, cc);
         }
         if( nParen>0 ){
           sqlite3_str_appendf(pOut, "%.*c",nParen,')');