github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-19 21:03:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2018-03-19 11:18:54 -07:00
commit 209f6d9d2d
71 changed files with 38483 additions and 1387 deletions
Download patch file Download diff file Expand all files Collapse all files

8
service/OneService.cpp
View file

@ -2276,7 +2276,7 @@ public:
// Check to see if we've already written this first. This reduces
// redundant writes and I/O overhead on most platforms and has
// little effect on others.
f = fopen(p,"r");
f = fopen(p,"rb");
if (f) {
char buf[65535];
long l = (long)fread(buf,1,sizeof(buf),f);
@ -2285,10 +2285,10 @@ public:
return;
}
f = fopen(p,"w");
f = fopen(p,"wb");
if ((!f)&&(dirname[0])) { // create subdirectory if it does not exist
OSUtils::mkdir(dirname);
f = fopen(p,"w");
f = fopen(p,"wb");
}
if (f) {
if (fwrite(data,len,1,f) != 1)
@ -2417,7 +2417,7 @@ public:
default:
return -1;
}
FILE *f = fopen(p,"r");
FILE *f = fopen(p,"rb");
if (f) {
int n = (int)fread(data,1,maxlen,f);
fclose(f);