]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
shell.c.in: on non-Windows platforms, check for $XDG_CONFIG_HOME/sqlite3/sqliterc...
authorstephan <stephan@noemail.net>
Fri, 18 Nov 2022 15:22:45 +0000 (15:22 +0000)
committerstephan <stephan@noemail.net>
Fri, 18 Nov 2022 15:22:45 +0000 (15:22 +0000)
FossilOrigin-Name: 17065d095d26a814acf1e13f5cc18b21fecc58eb8c9da100458029bb139fcd35

1  2 
manifest
manifest.uuid
src/shell.c.in

diff --cc manifest
index 00bc7b6ef8c0117239337b4202bff8a70bd13e3a,bbdd1009b9b86405b951d7e182a0cc40da501575..e49970e29b00aba5e1ca872c0e0b34128e133918
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\scorner\scases\sin\sUTF8\shandling\sin\sthe\sREGEXP\sextension.\n[forum:/forumpost/3ffe058b04|Forum\spost\s3ffe058b04].
- D 2022-11-17T19:24:39.375
+ C shell.c.in:\son\snon-Windows\splatforms,\scheck\sfor\s$XDG_CONFIG_HOME/sqlite3/sqliterc\sbefore\s~/.sqliterc,\sper\srequest\sin\s[forum:7a16582b1e403c81|forum\spost\s7a16582b1e403c81].
 -D 2022-11-06T13:12:11.629
++D 2022-11-18T15:22:45.180
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -630,16 -629,16 +630,16 @@@ F src/parse.y 8e67d820030d2655b9942ffe6
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 -F src/pragma.c 41430ca04735cc8e5d003bfd9315eadede3ec326e50805cc81bcf34e46601292
 +F src/pragma.c 894c2621d35edd4beea9b331cfdb1b42032394420074d2294c8febe548eea8a1
  F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 +F src/prepare.c 9ebd3a1b12bbd1951f0d6db850f32cf5d4547a6ab8bb9e958d75dfbe4e60d0a3
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 -F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 +F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c 12cb5162e606290354f9512ff0c30fc6dc4d7a77a92b6c5b581395f9c4edd047
 -F src/shell.c.in eae218c72d127dafdd46f768380a0c338e69dd50b9d7993ec3dbca7c11ab48ee
 -F src/sqlite.h.in bf5846820130b6cf01b002e90427eae29f02db07d9cb9b5ccd0e0aad867eed14
 +F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
- F src/shell.c.in a0ba4a297f8134fef1a6b618ac57604a6c4f1eadeab4f6950b99a8bc151f3c1f
++F src/shell.c.in 16740a86346ba9823f92528ec588f2b74f68166dac965dabd19883ace230f11d
 +F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
  F src/sqliteInt.h 2c24ba38f78e32fe5d7ec136321a6ad827698b33ca98664970a8b7274d69ef7c
@@@ -2055,8 -2054,11 +2055,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 7c572d02e60a83b36543ba4d9d45f61e9fc111b61fee085410c2d87558c732d6
- R f93830c4b318c6359968570a2d6be5a6
- U drh
- Z 502cd80eb5e32a4170e530e0ee906c79
 -P 2b68fc8aa35cc69e4d2c26aaebbf3f2b1f1c08d15ca9efcbe5be21d45735d3f1
 -R 761db6cbff4c93d54e2273bd93e61ecf
 -T *branch * sqliterc-xdg-config
 -T *sym-sqliterc-xdg-config *
 -T -sym-trunk * Cancelled\sby\sbranch.
++P abb18f61c5cec0f524acc41453b4c06b61c5af51ff46417588837fc0c3967288 49c6e438a83b9ff40ebadd3dfd5f58e6eea053575e15335909f5ee59a6dba82c
++R b7d6e814ba737a6b7a457711e5f6de4b
++T +closed 49c6e438a83b9ff40ebadd3dfd5f58e6eea053575e15335909f5ee59a6dba82c Closed\sby\sintegrate-merge.
+ U stephan
 -Z b1d4f5aca54a8028201ab20f9960723f
++Z 43c8e43e0f98659e4d07cefba98fa2de
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 13c0efb61f6ee29035bb285c6d72bccfa99edb8d,ac44292681ccb9efd443fefabfa22a91060e8fde..77b2a474df3fcce26bf8eee3eb7765a79febd8b4
@@@ -1,1 -1,1 +1,1 @@@
- abb18f61c5cec0f524acc41453b4c06b61c5af51ff46417588837fc0c3967288
 -49c6e438a83b9ff40ebadd3dfd5f58e6eea053575e15335909f5ee59a6dba82c
++17065d095d26a814acf1e13f5cc18b21fecc58eb8c9da100458029bb139fcd35
diff --cc src/shell.c.in
Simple merge