Bug fix to the --lineline option in the CLI. Other minor CLI tweaks.

FossilOrigin-Name: 40f81a9f9f6ea29144174fbd487f83d150a1be8f35e7496bfc1cfc6a556b6312

diff --git a/manifest b/manifest
index ecc36a524cb5bc903e660c9db047332b7726fec1..7bf5576fcc318cb146d231dbf44afcb45a64f5e0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Columnar\smodes\srespond\sto\snScreenWidth.
-D 2025-11-15T15:18:41.104
+C Bug\sfix\sto\sthe\s--lineline\soption\sin\sthe\sCLI.\s\sOther\sminor\sCLI\stweaks.
+D 2025-11-15T15:30:55.717
 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 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a
-F src/shell.c.in 8304a5deebc291c52b7c6c9ced5014760a813133ac587fe7a8e3e826fb2cb477
+F src/shell.c.in ccb6f8060233e2dd8a678af0c9fa2625ba65ad5690b912080b5b8366f60ea4f6
 F src/sqlite.h.in 795ce84cc136b4e74d882cf4fab56d2927c20b9af9fd2fcea27760a6fe50851b
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2176,8 +2176,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P cbe233ca131118692fd4a84d8fcf0dfca926fa935f66cfb718c235d54084de3d
-R 49aa952fd6d1037ed4892eb8fb7a4604
+P 60d26ebb4d91cc885b6b938ef2fc2864ebbf5a18d2e456521ee2f4aa3b22eddf
+R 343b0aedee84072a783fbbc3c8f28219
 U drh
-Z 19e20e94655f4bd956606b3998f9b671
+Z 467ae276ba000788078f7d43583d6bbe
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9645122c510ef49c056f4ef1d07ec5e8380bc125..924e7e634767aa62d041d31119cda57dfc12540f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60d26ebb4d91cc885b6b938ef2fc2864ebbf5a18d2e456521ee2f4aa3b22eddf
+40f81a9f9f6ea29144174fbd487f83d150a1be8f35e7496bfc1cfc6a556b6312

diff --git a/src/shell.c.in b/src/shell.c.in
index 0258d4f1eeff04d77c94b1853d3267eeab7ee5f9..f411d28f5ced27cf6617b78c4b1432613245bc85 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7430,7 +7430,7 @@ static int dotCmdMode(ShellState *p){
       if( k==0 ){
         p->mode.spec.nCharLimit = w;
       }else{
-        p->mode.spec.nLineLimit = 2;
+        p->mode.spec.nLineLimit = w;
       }
       chng = 1;
     }else if( 0<=(k=pickStr(z,0,"-tablename","-rowsep","-colsep","-null","")) ){
@@ -7477,7 +7477,7 @@ static int dotCmdMode(ShellState *p){
     }else if( optionMatch(z,"quote") ){
       if( i+1<nArg
        && azArg[i+1][0]!='-'
-       && (iMode>0 || modeFind(p, azArg[i+1])<0)
+       && (iMode>0 || strcmp(azArg[i+1],"off")==0 || modeFind(p, azArg[i+1])<0)
       ){
         /* --quote is followed by an argument other that is not an option
         ** or a mode name.  See it must be a boolean or a keyword to describe
@@ -7592,7 +7592,7 @@ static int dotCmdMode(ShellState *p){
       }
       p->mode.spec.bTextJsonb = booleanValue(azArg[++i]) ? QRF_Yes : QRF_No;
       chng = 1;
-    }else if( optionMatch(z,"titles") ){
+    }else if( optionMatch(z,"titles") || optionMatch(z,"title") ){
       char *zErr = 0;
       if( i+1>=nArg ){
         dotCmdError(p, i, "missing argument", 0);