From: drh <> Date: Sun, 22 Oct 2023 17:27:55 +0000 (+0000) Subject: Do not do backslash excape processing on any unquoted strings in dot-commands X-Git-Tag: version-3.44.0~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a63539143da79df705746156923a6bfd8248932f;p=thirdparty%2Fsqlite.git Do not do backslash excape processing on any unquoted strings in dot-commands in the CLI - on Windows or on posix-like systems either one. This brings the processing into alignment with the documentation, allows backslash-delimited filenames on Windows (as long as they are unquoted), and causes the CLI to work the same with regard to backslash escapes on both Windows and posix. FossilOrigin-Name: bce807cd4876327396b4ffcdf77f6931dd3bbd3314336eedf38bcf01d17af32c --- diff --git a/manifest b/manifest index 16ecd5eb71..394fca4ea2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C JNI:\simprove\sUB\sprotections\sin\ssqlite3_bind_blob/text/text16(). -D 2023-10-22T12:33:05.772 +C Do\snot\sdo\sbackslash\sexcape\sprocessing\son\sany\sunquoted\sstrings\sin\sdot-commands\nin\sthe\sCLI\s-\son\sWindows\sor\son\sposix-like\ssystems\seither\sone.\s\sThis\sbrings\sthe\nprocessing\sinto\salignment\swith\sthe\sdocumentation,\sallows\sbackslash-delimited\nfilenames\son\sWindows\s(as\slong\sas\sthey\sare\sunquoted),\sand\scauses\sthe\sCLI\sto\swork\nthe\ssame\swith\sregard\sto\sbackslash\sescapes\son\sboth\sWindows\sand\sposix. +D 2023-10-22T17:27:55.683 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -722,7 +722,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c f9d8ece7f0742d7b835efa9590ccda4eccee5b9def7581ec94f556e3c52efe51 -F src/shell.c.in 3399636eedfea4e7f7dfd07634615b6175b6b2228ab236d737f7a656b2c4fc2d +F src/shell.c.in 66995332610ed7d47483152c4c78810519ca9ac8b2f93ee884127ce330ca12e8 F src/sqlite.h.in b37b3df6fb0684929446c095e81287fbdffd64f55481e4195ee7768f2f0ae72e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac @@ -2136,8 +2136,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b8258103fb433d9f5cfa15661b5edf4e60128fb4161d8a18e5cc3253e5aed72b -R 10dd3eddc3858c0c90f96d7af2dd213f -U stephan -Z 39a3acd541e66480809465cadb3002fa +P 5c8383210a87d7f9d37a27053b5b1b6f41794fa8612826c68c1ca49c495cbd97 +R d2a23c5e194f0fe63ea38e6c9b5e3aea +U drh +Z ef79587c1d70c03b11d881794d008e37 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bcfb4efa95..03c43b5e5f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5c8383210a87d7f9d37a27053b5b1b6f41794fa8612826c68c1ca49c495cbd97 \ No newline at end of file +bce807cd4876327396b4ffcdf77f6931dd3bbd3314336eedf38bcf01d17af32c \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index f314a2ea35..50f78acca8 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -8033,9 +8033,6 @@ static int do_meta_command(char *zLine, ShellState *p){ azArg[nArg++] = &zLine[h]; while( zLine[h] && !IsSpace(zLine[h]) ){ h++; } if( zLine[h] ) zLine[h++] = 0; -#ifndef _WIN32 /* Don't convert bare \ on Windows - doing so damages filenames */ - resolve_backslashes(azArg[nArg-1]); -#endif } } azArg[nArg] = 0;