From: shearer <shearer@noemail.net>
Date: Fri, 25 Sep 2020 14:26:49 +0000 (+0000)
Subject: Reset to trunk's func. Still learning Fossil.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a8847a5fc7b18b3c664581c70538807a5065847;p=thirdparty%2Fsqlite.git

Reset to trunk's func. Still learning Fossil.

FossilOrigin-Name: a4840cf5c682a22f32eb1890fc4ecc35a367d967142b284e5993c7faf512d71e
---

diff --git a/manifest b/manifest
index c02102a1d7..ec631f1b7e 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be
-C More\sclassification\sof\sfunctions.\nFix\sincorrect\scomment\sthat\ssqlite3BtreeCursorHasHint()\sis\sonly\sused\swithin\nasserts.
-D 2020-09-25T13:56:31.904
+C Reset\sto\strunk's\sfunc.\sStill\slearning\sFossil.
+D 2020-09-25T14:26:49.818
 F ext/expert/expert1.test dba6e752cc701621771f925f3872b183fa688f7b4a9f4822631fc02bdbffc45a
 F ext/expert/sqlite3expert.c 2778d9f06b3a8bfa859cb6b75b82f004477bf5dd78edd17d954319750ca963f3
 F ext/fts5/fts5Int.h ba835c165bb87650fc806008969799a7a1fbe3e221fd5a850dd044eb6a87b243
@@ -14,7 +14,6 @@ F ext/fts5/test/fts5integrity.test e387b2bd1c83e50f4a12f58a5fd399111bbab36be2f1c
 F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035
 F src/btree.c fb7970654479f968ab09321f6a6c8b796174860b641f7d8879f221dd6667e272
 F src/btree.h 3bf68d60824f6495904ceb0df9102a3413fed933d80c43aefc8e094875105e30
-F src/func.c 01d7b7226a02aaa471f667aad348206c55b59390f50250af84260a13aa77285e
 F src/pragma.c 6daaaecc26a4b09481d21722525b079ce756751a43a79cc1d8f122d686806193
 F src/select.c 6c3f7d60295f06ce7fa128bb23b1159648f0aa96a78c257af35dfef727ac63f1
 F src/sqlite.h.in cb9f0862e8d0f8691de95b18439ab60666f868c83bc65e3a17f0a0b44cc8f8a9
@@ -23,7 +22,7 @@ F src/wherecode.c 9afd600ca9fe831f342121cca48ad8839c8a18ca4e0372518a0a3c8123a8f0
 F test/with1.test 323659eaf309787add657d05e5943e437a7a3494f2b6602a0deb18fdebc1ab4c
 F tool/lemon.c 70eedc31614a58fe31a71025c17ebd1502a6ce9cfef0ed5e33acb0b5b737b291
 F tool/lempar.c 0e1d5eeb9736108d3dba782a9dd56f4e7cb69006b6ee181308b7ebfb15313a12
-P 3a576608e6f26ae8642ec4b2b1c2f2b91b1acda3dc9928b9d67e401684c254b3
-R fcbee21c7e42fda63f727e06739686dd
+P 78d8db7cb73284644cde1636a14e4e3598e1a2a7e94a04dfc7406422aab93ae5
+R bc0e1702bf8a1aafdab8ae0b180ad2bf
 U shearer
-Z bbb54d9bd1cac5be9cfe1852d403631f
+Z 9442bc333cd0ee23ba290ef720a3f91e
diff --git a/manifest.uuid b/manifest.uuid
index f10df1aff0..3468109966 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78d8db7cb73284644cde1636a14e4e3598e1a2a7e94a04dfc7406422aab93ae5
\ No newline at end of file
+a4840cf5c682a22f32eb1890fc4ecc35a367d967142b284e5993c7faf512d71e
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 0950f7984c..48b5f5f198 100644
--- a/src/func.c
+++ b/src/func.c
@@ -10,10 +10,8 @@
 **
 *************************************************************************
 ** This file contains the C-language implementations for many of the SQL
-** functions of SQLite.  (Some functions, and in particular the date and
+** functions of SQLite.  (Some function, and in particular the date and
 ** time functions, are implemented separately.)
-**
-** Many of these functions are never called from other parts of SQLite.
 */
 #include "sqliteInt.h"
 #include <stdlib.h>
@@ -259,6 +257,32 @@ endInstrOOM:
   goto endInstr;
 }
 
+/*
+** Implementation of the printf() function.
+*/
+static void printfFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  PrintfArguments x;
+  StrAccum str;
+  const char *zFormat;
+  int n;
+  sqlite3 *db = sqlite3_context_db_handle(context);
+
+  if( argc>=1 && (zFormat = (const char*)sqlite3_value_text(argv[0]))!=0 ){
+    x.nArg = argc-1;
+    x.nUsed = 0;
+    x.apArg = argv+1;
+    sqlite3StrAccumInit(&str, db, 0, 0, db->aLimit[SQLITE_LIMIT_LENGTH]);
+    str.printfFlags = SQLITE_PRINTF_SQLFUNC;
+    sqlite3_str_appendf(&str, zFormat, &x);
+    n = str.nChar;
+    sqlite3_result_text(context, sqlite3StrAccumFinish(&str), n,
+                        SQLITE_DYNAMIC);
+  }
+}
 
 /*
 ** Implementation of the substr() function.
@@ -1945,6 +1969,7 @@ void sqlite3RegisterBuiltinFunctions(void){
     FUNCTION2(typeof,            1, 0, 0, typeofFunc,  SQLITE_FUNC_TYPEOF),
     FUNCTION2(length,            1, 0, 0, lengthFunc,  SQLITE_FUNC_LENGTH),
     FUNCTION(instr,              2, 0, 0, instrFunc        ),
+    FUNCTION(printf,            -1, 0, 0, printfFunc       ),
     FUNCTION(unicode,            1, 0, 0, unicodeFunc      ),
     FUNCTION(char,              -1, 0, 0, charFunc         ),
     FUNCTION(abs,                1, 0, 0, absFunc          ),