Text quoting formats CSV and HTML.

FossilOrigin-Name: ea69f1f81f867fe058889effdc128e8cc358b61b9121c1932bba8895bd709adb

diff --git a/ext/misc/resfmt.c b/ext/misc/resfmt.c
index 7fd952747fe78a613370c6ed329e9ea4ba6fa023..a07321efdc053d496e47b765560fd901160cb93f 100644 (file)
--- a/ext/misc/resfmt.c
+++ b/ext/misc/resfmt.c
@@ -135,6 +135,29 @@ static void resfmtEscape(
   }
 }
 
+/*
+** If a field contains any character identified by a 1 in the following
+** array, then the string must be quoted for CSV.
+*/
+static const char resfmtCsvQuote[] = {
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 0, 1, 0, 0, 0, 0, 1,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+};
+
 /*
 ** Encode text appropriately and append it to p->pOut.
 */
@@ -145,6 +168,51 @@ static void resfmtEncodeText(sqlite3_resfmt *p, const char *zTxt){
       sqlite3_str_appendf(p->pOut, "%Q", zTxt);
       break;
     }
+    case RESFMT_Q_Csv: {
+      unsigned int i;
+      for(i=0; zTxt[i]; i++){
+        if( resfmtCsvQuote[((const unsigned char*)zTxt)[i]] ){
+          i = 0;
+          break;
+        }
+      }
+      if( i==0 || strstr(zTxt, p->spec.zColumnSep)!=0 ){
+        sqlite3_str_appendf(p->pOut, "\"%w\"", zTxt);
+      }else{
+        sqlite3_str_appendall(p->pOut, zTxt);
+      }
+      break;
+    }
+    case RESFMT_Q_Html: {
+      while( *zTxt ){
+        unsigned int i;
+        for(i=0;   zTxt[i]
+                && zTxt[i]!='<'
+                && zTxt[i]!='&'
+                && zTxt[i]!='>'
+                && zTxt[i]!='\"'
+                && zTxt[i]!='\'';
+            i++){}
+        if( i>0 ){
+          sqlite3_str_append(p->pOut, zTxt, i);
+        }
+        if( zTxt[i]=='<' ){
+          sqlite3_str_append(p->pOut, "&lt;", 4);
+        }else if( zTxt[i]=='&' ){
+          sqlite3_str_append(p->pOut, "&amp;", 5);
+        }else if( zTxt[i]=='>' ){
+          sqlite3_str_append(p->pOut, "&gt;", 4);
+        }else if( zTxt[i]=='\"' ){
+          sqlite3_str_append(p->pOut, "&quot;", 6);
+        }else if( zTxt[i]=='\'' ){
+          sqlite3_str_append(p->pOut, "&#39;", 5);
+        }else{
+          break;
+        }
+        zTxt += i + 1;
+      }
+      break;
+    }
     default: {
       sqlite3_str_appendall(p->pOut, zTxt);
       break;

diff --git a/manifest b/manifest
index ae39ac0fbd25bf57ac61bae5b3bccfcae5009936..276f8ec63938bf51b99d19dcb9280124df8f4236 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sseparate\squoting\sstyle\sfor\sBLOB\svalues.
-D 2025-10-21T15:30:38.080
+C Text\squoting\sformats\sCSV\sand\sHTML.
+D 2025-10-21T19:03:27.840
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -390,7 +390,7 @@ F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e
 F ext/misc/regexp.c 548151f3e57506fda678e6a65e85a763f4eece653287e1ad44e167f9485e0c6b
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/resfmt-tester.c 4c493f3b74f1bc49c606a504ca8417e4a0c7bc114611c2b963df1e35f34f19bc
-F ext/misc/resfmt.c 40cc38e8ca5ba02f3ee03bfdd02f305e6dc0db151ce6929629365ac356702692
+F ext/misc/resfmt.c f9ce5692e1073365c7c802b9cab4f1daae2305337823704ecbc1f51505424117
 F ext/misc/resfmt.h 0abf02956c5f03ff7823861d0134e541e435426ed5ba7209bf6dfb8b61e0cd0e
 F ext/misc/resfmt.md 6f6cefd95fa11ce30e4f34ea84052e7a8291dd48b7e666352bd7cf2e22c22ec4
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
@@ -2175,8 +2175,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fbb69764559f4333890860f4f3c010efa9cc994a82743766b948e7635fd079e8
-R 0b9bda5bbcc16ecc914edff675de2c46
+P dfe537175e7d15507e8532817a06f76dc375c7eb00f5cdc4b4f8d71ec516137e
+R 943cce1d6aa90e539d34e5a07e602a68
 U drh
-Z 666fe7e2fd9d7f3f1b51180f13bf63cd
+Z f8c39150b7e63d6730496eb58e006afd
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8a56790cebdc5dd8ae1bb74b81b096a28654a808..ba9c7725f189feb0373a311cdb80399d2032fb05 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dfe537175e7d15507e8532817a06f76dc375c7eb00f5cdc4b4f8d71ec516137e
+ea69f1f81f867fe058889effdc128e8cc358b61b9121c1932bba8895bd709adb