From: dan <dan@noemail.net>
Date: Thu, 15 Feb 2018 15:17:42 +0000 (+0000)
Subject: When calling fopen() in the zonefile extension, use modes "rb" and "wb"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e8f3bbd9550ade80c528be9fc4f7330914b39d6;p=thirdparty%2Fsqlite.git

When calling fopen() in the zonefile extension, use modes "rb" and "wb"
instead of "r" and "w". This makes no difference on unix, but is required when
accessing binary files on other systems.

FossilOrigin-Name: 4bb854ddd9c1dc2972fd4f7c2c2b2d121caa662d5085694c2dbb35d331a61444
---

diff --git a/ext/zonefile/zonefile.c b/ext/zonefile/zonefile.c
index 22a8862823..d57faaaf56 100644
--- a/ext/zonefile/zonefile.c
+++ b/ext/zonefile/zonefile.c
@@ -348,7 +348,7 @@ static int zonefileFileRead(FILE *pFd, u8 *aBuf, int nBuf, i64 iOff){
 }
 
 static FILE *zonefileFileOpen(const char *zFile, int bWrite, char **pzErr){
-  FILE *pFd = fopen(zFile, bWrite ? "w" : "r");
+  FILE *pFd = fopen(zFile, bWrite ? "wb" : "rb");
   if( pFd==0 ){
     *pzErr = sqlite3_mprintf("failed to open file \"%s\" for %s",
         zFile, bWrite ? "writing" : "reading"
diff --git a/manifest b/manifest
index fe0d11db18..b90981a17b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sformatting\serrors\sin\sext/zonefile/README.md.
-D 2018-02-13T21:16:16.016
+C When\scalling\sfopen()\sin\sthe\szonefile\sextension,\suse\smodes\s"rb"\sand\s"wb"\ninstead\sof\s"r"\sand\s"w".\sThis\smakes\sno\sdifference\son\sunix,\sbut\sis\srequired\swhen\naccessing\sbinary\sfiles\son\sother\ssystems.
+D 2018-02-15T15:17:42.189
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -409,7 +409,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F ext/zonefile/README.md 387ad2b748e98eeea21fd4dbb609fefe313263fadb3fc6c01c512b4c95e55ae4
-F ext/zonefile/zonefile.c 0e2ace4a2590b96ea1ed6ecff98af7504e6774755961e42bf982d268d5366856
+F ext/zonefile/zonefile.c e6ad01c704eed24306990c1dd5dbe8b45e590c8dbb0e3a8d95cb1aec41c815c0
 F ext/zonefile/zonefile1.test 872ec8d549af0f1423601acdfe29390803fab3e14b8d5715f2f4bbd11431f1f5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -1708,7 +1708,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fb27d8f6a87e0dc1253622839c2164a7eb09f21fc0a16817c2ba9264561b77c2
-R 651fa19848737ae2059a9da1a68f2e96
+P a2221e35d6c34d0c07bee9329073ad12cad4ba88437dd40cea71ae3ffc77eeef
+R a0d3d52c8893df73e9ad6db01913acd7
 U dan
-Z edd633def9049f4354c2d3ddd6381851
+Z 81d210b1b092270aa489eff76d621726
diff --git a/manifest.uuid b/manifest.uuid
index 11e84345b1..516bb5cef2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a2221e35d6c34d0c07bee9329073ad12cad4ba88437dd40cea71ae3ffc77eeef
\ No newline at end of file
+4bb854ddd9c1dc2972fd4f7c2c2b2d121caa662d5085694c2dbb35d331a61444
\ No newline at end of file