diff --git a/Makefile.in b/Makefile.in
index e11c33d370..ac1e627f52 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -701,7 +701,7 @@ dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
RSYNC_SRC = \
- $(TOP)/tool/sqlite3-rsync.c \
+ $(TOP)/tool/sqlite3_rsync.c \
sqlite3.c
RSYNC_OPT = \
@@ -711,7 +711,7 @@ RSYNC_OPT = \
-DSQLITE_OMIT_LOAD_EXTENSION \
-DSQLITE_OMIT_DEPRECATED
-sqlite3-rsync$(TEXE): $(RSYNC_SRC)
+sqlite3_rsync$(TEXE): $(RSYNC_SRC)
$(TCC) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(TLIBS)
scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
@@ -1558,8 +1558,8 @@ snapshot-tarball: sqlite3.c sqlite3rc.h
# Build a ZIP archive containing various command-line tools.
#
-tool-zip: testfixture sqlite3 sqldiff sqlite3_analyzer sqlite3-rsync $(TOP)/tool/mktoolzip.tcl
- strip sqlite3 sqldiff sqlite3_analyzer sqlite3-rsync
+tool-zip: testfixture sqlite3 sqldiff sqlite3_analyzer sqlite3_rsync $(TOP)/tool/mktoolzip.tcl
+ strip sqlite3 sqldiff sqlite3_analyzer sqlite3_rsync
./testfixture $(TOP)/tool/mktoolzip.tcl
# The next two rules are used to support the "threadtest" target. Building
@@ -1645,7 +1645,7 @@ tidy:
rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl
- rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
+ rm -f sqlite3_analyzer$(TEXE) sqlite3_rsync$(TEXE)
rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE)
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
rm -f threadtest5$(TEXE)
diff --git a/Makefile.msc b/Makefile.msc
index 4a8abc9e3d..1e20849107 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1908,7 +1908,7 @@ dbhash.exe: $(TOP)\tool\dbhash.c $(SQLITE3C) $(SQLITE3H)
$(LTLINK) $(NO_WARN) $(TOP)\tool\dbhash.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
RSYNC_SRC = \
- $(TOP)\tool\sqlite3-rsync.c \
+ $(TOP)\tool\sqlite3_rsync.c \
$(SQLITE3C)
RSYNC_OPT = \
@@ -1917,7 +1917,7 @@ RSYNC_OPT = \
-DSQLITE_OMIT_LOAD_EXTENSION \
-DSQLITE_OMIT_DEPRECATED
-sqlite3-rsync.exe: $(RSYNC_SRC) $(LIBRESOBJS)
+sqlite3_rsync.exe: $(RSYNC_SRC) $(LIBRESOBJS)
$(LTLINK) $(RSYNC_OPT) $(NO_WARN) $(RSYNC_SRC) /link $(LDFLAGS) $(LTLINKOPTS) $(LIBRESOBJS)
scrub.exe: $(TOP)\ext\misc\scrub.c $(SQLITE3C) $(SQLITE3H)
@@ -2577,7 +2577,7 @@ extensiontest: testfixture.exe testloadext.dll
@set PATH=$(LIBTCLPATH);$(PATH)
.\testfixture.exe $(TOP)\test\loadext.test $(TESTOPTS)
-tool-zip: testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe sqlite3-rsync.exe $(TOP)\tool\mktoolzip.tcl
+tool-zip: testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe sqlite3_rsync.exe $(TOP)\tool\mktoolzip.tcl
.\testfixture.exe $(TOP)\tool\mktoolzip.tcl
coretestprogs: testfixture.exe sqlite3.exe
@@ -2829,7 +2829,7 @@ clean:
del /Q sqlite3.c sqlite3-*.c sqlite3.h 2>NUL
del /Q sqlite3rc.h 2>NUL
del /Q shell.c sqlite3ext.h sqlite3session.h 2>NUL
- del /Q sqlite3_analyzer.exe sqlite3_analyzer.c sqlite3-rsync.exe 2>NUL
+ del /Q sqlite3_analyzer.exe sqlite3_analyzer.c sqlite3_rsync.exe 2>NUL
del /Q sqlite-*-output.vsix 2>NUL
del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL
del /Q sqltclsh.* 2>NUL
diff --git a/doc/compile-for-unix.md b/doc/compile-for-unix.md
index f35e013420..ff5e2111a7 100644
--- a/doc/compile-for-unix.md
+++ b/doc/compile-for-unix.md
@@ -39,7 +39,7 @@ are general and should work on most any modern unix platform.
`make sqlite3.c`
`make sqlite3`
`make sqldiff`
- `make sqlite3-rsync`
+ `make sqlite3_rsync`
`make tclextension-install`
`make devtest`
`make releasetest`
diff --git a/doc/compile-for-windows.md b/doc/compile-for-windows.md
index acc7335618..fe06697c56 100644
--- a/doc/compile-for-windows.md
+++ b/doc/compile-for-windows.md
@@ -58,7 +58,7 @@ canonical source on a new Windows 11 PC, as of 2024-10-09:
`nmake /f makefile.msc sqlite3.c`
`nmake /f makefile.msc sqlite3.exe`
`nmake /f makefile.msc sqldiff.exe`
- `nmake /f makefile.msc sqlite3-rsync.exe`
+ `nmake /f makefile.msc sqlite3_rsync.exe`
`nmake /f makefile.msc tclextension-install`
`nmake /f makefile.msc devtest`
`nmake /f makefile.msc releasetest`
diff --git a/main.mk b/main.mk
index f0f41736d1..3c2c379a39 100644
--- a/main.mk
+++ b/main.mk
@@ -569,7 +569,7 @@ dbhash$(EXE): $(TOP)/tool/dbhash.c sqlite3.c sqlite3.h
$(TOP)/tool/dbhash.c sqlite3.c $(TLIBS) $(THREADLIB)
RSYNC_SRC = \
- $(TOP)/tool/sqlite3-rsync.c \
+ $(TOP)/tool/sqlite3_rsync.c \
sqlite3.c
RSYNC_OPT = \
@@ -578,7 +578,7 @@ RSYNC_OPT = \
-DSQLITE_OMIT_LOAD_EXTENSION \
-DSQLITE_OMIT_DEPRECATED
-sqlite3-rsync$(EXE): $(RSYNC_SRC)
+sqlite3_rsync$(EXE): $(RSYNC_SRC)
$(TCC) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(TLIBS)
scrub$(EXE): $(TOP)/ext/misc/scrub.c sqlite3.o
@@ -1159,7 +1159,7 @@ clean:
rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
rm -f *.dll *.lib *.exp *.def *.pc *.vsix
- rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
+ rm -f sqlite3_analyzer$(TEXE) sqlite3_rsync$(TEXE)
rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE)
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
rm -f threadtest5$(TEXE)
diff --git a/manifest b/manifest
index d1fd7a5af5..31c14437a8 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C In\sthe\sunix\sMakefile,\sstrip\scompiled\sbinaries\sprior\sto\sadding\sthem\sto\sthe\ntool\sZIP\sarchive.
-D 2024-10-16T10:20:30.451
+C Change\sthe\sname\sof\sthe\snew\sutility\sprogram\sfrom\ssqlite3-rsync\sto\nsqlite3_rsync\s-\sdash\schanged\sto\sunderscore\s-\sfor\sconsistency\swith\sthe\npreexisting\ssqlite3_analyzer.
+D 2024-10-16T11:05:11.378
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 78e76e161981608a8c96ef92045d024ff8fced0b6d6ff442c1bafb93e2cf4467
+F Makefile.in c7dfd928d41c791ccaabdb87512bd95d826fc275884912b1b89ff3f96bb791aa
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 12d2c38554bddf5e698aba580eb863c762c0e1d46f5cad60d028e7270c33cdc2
+F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -39,8 +39,8 @@ F configure 135e050689ea244477582e6d77cc7867dfcfe6e0f82e3eab3e47655a67035f8f x
F configure.ac aca8ebf47b7644c473e11e599ea986eeb23860a8732a8812039ad961ef52a713
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
-F doc/compile-for-unix.md 37a3a7cfe32ed74b15d099f56e583f9e9df37b7109a8df880ff5e725424f8f17
-F doc/compile-for-windows.md 8e00693196087e3564a9a2bce642fa39febc1c901212832fbe0637681dada3db
+F doc/compile-for-unix.md 90f17554cc3d19b2dae8142b5aeda1a8890692d5f2e091ed4a6f9b46b8f10f62
+F doc/compile-for-windows.md a9ab9f6c49763d63d177a386a9e53ee670101f80e8bcb73cafca438156229076
F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
@@ -690,7 +690,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 0a55ebec3508ca1bdb593d86f3aa19d7fa42a2ddd3220703e6dc0a65f1338a43
+F main.mk c6501abe2d915ed1a2ec3d074e652c096177f93c50ac91f815c831e3417f9019
F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -772,7 +772,7 @@ F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
F src/shell.c.in 0662f9bcf0725461778d0254a06150e5d61c08c5a87a7281ccdf45552050c79d
-F src/sqlite.h.in 547508e419f83421fea0282dee4ea82fc575cc8bfd6ec13d333fc1bd82b9f70e
+F src/sqlite.h.in add9e064d6b42af8f1a4a3322bddadec76696e520aedebd83e0d3211c15ac999
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
F src/sqliteInt.h ad02397dc4d22b77f9a331412d46e4c1e49459dd386fba8373fa148998e1e7d0
@@ -2150,7 +2150,7 @@ F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6
F tool/mksqlite3c.tcl c6acfdf4e4ef93478ff3ce3cd593e17abb03f446036ce710c3156bcfa18665e0
F tool/mksqlite3h.tcl d391cff7cad0a372ee1406faee9ccc7dad9cb80a0c95cae0f73d10dd26e06762
F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
-F tool/mktoolzip.tcl ca5d73696b0c0b58a071add0fd082aaeb8050bd9072f34c69e68a60624d6a165
+F tool/mktoolzip.tcl 1b3383c6cd1ca3e1bfdf157d1383f29d6264b9600c381e682789c83617dc1014
F tool/mkvsix.tcl 67b40996a50f985a573278eea32fc5a5eb6110bdf14d33f1d8086e48c69e540a
F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
@@ -2178,8 +2178,8 @@ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
F tool/sqldiff.c 2a0987d183027c795ced13d6749061c1d2f38e24eddb428f56fa64c3a8f51e4b
-F tool/sqlite3-rsync.c 7c78ba15afa0b929604adb91c94af8dbdf8cbe87be8a5cba5353af0e320ca65a
F tool/sqlite3_analyzer.c.in 348ba349bbdc93c9866439f9f935d7284866a2a4e6898bc906ae1204ade56918
+F tool/sqlite3_rsync.c 2a2b79a0463d400696aa9429be5c0ddec6b1f7ceefa5fed7acfdc859a435221f w tool/sqlite3-rsync.c
F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4
@@ -2217,8 +2217,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f369de3d8fa34a403b5c9f6269f7e3fdb16a13784a70460c5032ad4e66615d64
-R a516d4923c3cbd6116cdc55d9e1d772d
+P cd8ae6fd7166680a6d121d710ff9d722e3e14d1d3538fc8ea1ea2690035ba80e
+R f59e8e07aac901ad2c06b0e923cde90c
U drh
-Z 650ee0412157fb1bcbcde3dfc36af0ff
+Z 5c76d596036c1f5be231ab915cf12e72
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7941bce70b..eaa5902a6f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd8ae6fd7166680a6d121d710ff9d722e3e14d1d3538fc8ea1ea2690035ba80e
+86e794cbaa5ae600635c933b46298a39f2465daf4c5cd1570f2a03e19ac08d9d
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index a46b1b6450..7097e6bb55 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -9352,7 +9352,7 @@ typedef struct sqlite3_backup sqlite3_backup;
**
**
** - The [VACUUM INTO] command.
-**
- The [sqlite3-rsync] utility program.
+**
- The [sqlite3_rsync] utility program.
**
*/
sqlite3_backup *sqlite3_backup_init(
diff --git a/tool/mktoolzip.tcl b/tool/mktoolzip.tcl
index 2f002accd1..a5951168a8 100644
--- a/tool/mktoolzip.tcl
+++ b/tool/mktoolzip.tcl
@@ -54,7 +54,7 @@ close $in
scan $vers %d.%d.%d v1 v2 v3
set v2 [format 3%02d%02d00 $v2 $v3]
set name sqlite-tools-$OS-$ARCH-$v2.zip
-set toollist "sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE sqlite3-rsync$EXE"
+set toollist "sqlite3$EXE sqldiff$EXE sqlite3_analyzer$EXE sqlite3_rsync$EXE"
puts "zip $name {*}$toollist"
exec zip $name {*}$toollist
puts "$name: [file size $name] bytes"
diff --git a/tool/sqlite3-rsync.c b/tool/sqlite3_rsync.c
similarity index 99%
rename from tool/sqlite3-rsync.c
rename to tool/sqlite3_rsync.c
index 401c4b33ef..688ff1efe3 100644
--- a/tool/sqlite3-rsync.c
+++ b/tool/sqlite3_rsync.c
@@ -21,7 +21,7 @@
#include "sqlite3.h"
static const char zUsage[] =
- "sqlite3-rsync ORIGIN REPLICA ?OPTIONS?\n"
+ "sqlite3_rsync ORIGIN REPLICA ?OPTIONS?\n"
"\n"
"One of ORIGIN or REPLICA is a pathname to a database on the local\n"
"machine and the other is of the form \"USER@HOST:PATH\" describing\n"
@@ -30,7 +30,7 @@ static const char zUsage[] =
"\n"
"OPTIONS:\n"
"\n"
- " --exe PATH Name of the sqlite3-rsync program on the remote side\n"
+ " --exe PATH Name of the sqlite3_rsync program on the remote side\n"
" --help Show this help screen\n"
" --ssh PATH Name of the SSH program used to reach the remote side\n"
" -v Verbose. Multiple v's for increasing output\n"
@@ -1586,13 +1586,13 @@ static char *hostSeparator(const char *zIn){
**
** Input formats:
**
-** (1) sqlite3-rsync FILENAME1 USER@HOST:FILENAME2
+** (1) sqlite3_rsync FILENAME1 USER@HOST:FILENAME2
**
-** (2) sqlite3-rsync USER@HOST:FILENAME1 FILENAME2
+** (2) sqlite3_rsync USER@HOST:FILENAME1 FILENAME2
**
-** (3) sqlite3-rsync --origin FILENAME1
+** (3) sqlite3_rsync --origin FILENAME1
**
-** (4) sqlite3-rsync --replica FILENAME2
+** (4) sqlite3_rsync --replica FILENAME2
**
** The user types (1) or (2). SSH launches (3) or (4).
**
@@ -1616,7 +1616,7 @@ int main(int argc, char const * const *argv){
FILE *pOut = 0;
int childPid = 0;
const char *zSsh = "ssh";
- const char *zExe = "sqlite3-rsync";
+ const char *zExe = "sqlite3_rsync";
char *zCmd = 0;
sqlite3_int64 tmStart;
sqlite3_int64 tmEnd;