From 9681fedbb44a25ffa1108b88a4795e017746ca6c Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Thu, 7 Jun 2018 17:25:27 -0700
Subject: Spellcheck sweep across codebase

---
 osdep/OSUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osdep/OSUtils.cpp')

diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
index cadd4e6b..8b7fd948 100644
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@@ -366,7 +366,7 @@ std::vector<std::string> OSUtils::split(const char *s,const char *const sep,cons
 				if (buf.size() > 0) {
 					fields.push_back(buf);
 					buf.clear();
-				} // else skip runs of seperators
+				} // else skip runs of separators
 			} else buf.push_back(*s);
 		}
 		++s;
-- 
cgit v1.2.3


From 3dd9b1aa9be18b127e86db65900fe3af00d60d04 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 10 Sep 2018 16:25:39 -0700
Subject: Added ability to specify zt home directory via ZEROTIER_HOME -
 Addresses ticket #829

---
 osdep/OSUtils.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'osdep/OSUtils.cpp')

diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
index 8b7fd948..e6c2f940 100644
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 
 #include "../node/Constants.hpp"
 #include "../node/Utils.hpp"
@@ -398,6 +399,21 @@ std::string OSUtils::platformDefaultHomePath()
     return homeDir;
 #endif
 
+    // Check for user-defined environment variable before using defaults
+#ifdef __WINDOWS__
+	DWORD bufferSize = 65535;
+	std::string userDefinedPath;
+	bufferSize = GetEnvironmentVariable("ZEROTIER_HOME", &userDefinedPath[0], bufferSize);
+	if (bufferSize) {
+		return userDefinedPath;
+	}
+#else
+	if(const char* userDefinedPath = getenv("ZEROTIER_HOME")) {
+		return std::string(userDefinedPath);
+	}
+#endif
+
+	// Finally, resort to using default paths if no user-defined path was provided
 #ifdef __UNIX_LIKE__
 
 #ifdef __APPLE__
-- 
cgit v1.2.3


From b8268d894b4dd0774eeb2bcd0009b818fe960b52 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 17 Sep 2018 11:44:56 -0700
Subject: Changed home path for Synology

---
 osdep/OSUtils.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'osdep/OSUtils.cpp')

diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
index e6c2f940..1e704d45 100644
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@@ -399,6 +399,10 @@ std::string OSUtils::platformDefaultHomePath()
     return homeDir;
 #endif
 
+#ifdef __SYNOLOGY__
+	return std::string("/var/packages/zerotier/target/var");
+#endif
+
     // Check for user-defined environment variable before using defaults
 #ifdef __WINDOWS__
 	DWORD bufferSize = 65535;
-- 
cgit v1.2.3