Relax arbitrary length restrictions on some error messages in the CLI.

FossilOrigin-Name: 52f5531ded8e0d3da3dc4d5c9b3d14573041b9446e2c45b5093c958b6c74e0de

diff --git a/manifest b/manifest
index 561601a1f10c13c7efaa1884f592716cd7f32c75..36bcd8d310fe8d3c0b3d38f1d49334ced729123f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sa\sstack-local\sbuffer\ssize\sto\sresolve\sa\stest\sregression\sintroduced\sin\s[ff084ae341eab5c],\sin\swhich\ssome\stests\sfail\sa\spattern\smatch\scheck\sif\stheir\sabsolute\sfile\snames\sare\stoo\slong.\sResolves\s[forum:205f73db1b2806f5|forum\spost\s205f73db1b2806f5].
-D 2026-04-27T12:05:56.375
+C Relax\sarbitrary\slength\srestrictions\son\ssome\serror\smessages\sin\sthe\sCLI.
+D 2026-04-27T12:43:09.376
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49
-F src/shell.c.in 203e063bde04082c07c6b7252caf4e141bbeef51d2aea6f5d615f7f14299f452
+F src/shell.c.in c76e531d1535404b302ddba8b7d3724e2c7e7a2ced2c52baf6503193055ff4a9
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 77662cce9aa452ba5820e5f1a864a802763bd83b937cdb16e7025219eff7bd08
-R 533419add0289853acef888d3998733c
-U stephan
-Z 71af801e5afb9e60c9961ecd8082850d
+P 286fc22c7ca882b0b09de2f1b2a7e0b382af6c498f2f8ad237fe064feaa70d7f
+R 30f0f3c6a27cfb9f81c87a8f3fefc7f3
+U drh
+Z d429d5410c97065efc2bafc46e2e54eb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b6dab789e70044fe90794471e379b166b245fd43..d1333a70c6be4205e9e5d37455957083068cb708 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-286fc22c7ca882b0b09de2f1b2a7e0b382af6c498f2f8ad237fe064feaa70d7f
+52f5531ded8e0d3da3dc4d5c9b3d14573041b9446e2c45b5093c958b6c74e0de

diff --git a/src/shell.c.in b/src/shell.c.in
index bd54de6cec662fa861eda87bd90c3f4302d0a69f..1976cf7e94ec3c02e6773823f30f1cfc16867eef 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12852,9 +12852,7 @@ static int runOneSqlLine(
   rc = shell_exec(p, zSql, &zErrMsg);
   END_TIMER(p);
   if( rc || zErrMsg ){
-    char zPrefix[2048
-                 /* must be relatively large:
-                 ** https://sqlite.org/forum/forumpost/205f73db1b2806f5 */];
+    sqlite3_str *pPrefix = sqlite3_str_new(p->db);
     const char *zErrorTail;
     const char *zErrorType;
     if( zErrMsg==0 ){
@@ -12872,28 +12870,27 @@ static int runOneSqlLine(
     }
     if( zFilename || !stdin_is_interactive ){
       if( cli_strcmp(zFilename,"cmdline")==0 ){
-        sqlite3_snprintf(sizeof(zPrefix), zPrefix,
+        sqlite3_str_appendf(pPrefix,
                   "%s in %r command line argument:", zErrorType, startline);
       }else if( cli_strcmp(zFilename,"<stdin>")==0 ){
-        sqlite3_snprintf(sizeof(zPrefix), zPrefix,
+        sqlite3_str_appendf(pPrefix,
                   "%s near line %d:", zErrorType, startline);
       }else{
-        sqlite3_snprintf(sizeof(zPrefix), zPrefix,
+        sqlite3_str_appendf(pPrefix,
                   "%s near line %d of %s:", zErrorType, startline, zFilename);
       }
     }else{
-      sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%s:", zErrorType);
+      sqlite3_str_appendf(pPrefix, "%s:", zErrorType);
     }
-    cli_printf(stderr,"%s %s\n", zPrefix, zErrorTail);
+    cli_printf(stderr,"%s %s\n", sqlite3_str_value(pPrefix), zErrorTail);
+    sqlite3_str_free(pPrefix);
     sqlite3_free(zErrMsg);
     zErrMsg = 0;
     return 1;
   }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-    char zLineBuf[2000];
-    sqlite3_snprintf(sizeof(zLineBuf), zLineBuf,
-            "changes: %lld   total_changes: %lld",
+    cli_printf(p->out, 
+            "changes: %lld   total_changes: %lld\n",
             sqlite3_changes64(p->db), sqlite3_total_changes64(p->db));
-    cli_printf(p->out, "%s\n", zLineBuf);
   }
 
   if( doAutoDetectRestore(p, zSql) ) return 1;