X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ffileutils.cpp;h=8f78745fa7b0000b15b9f3e6dc6905f3a3de82fb;hb=6214094a84f33ea80af4dac88dd1b82bd59a0b5c;hp=d5e1e58397977a27c513debb680b170d22bb0685;hpb=6e898936d6e0f44da0992ad09139f0e8e6d141af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index d5e1e5839..8f78745fa 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
+ *   Copyright (C) 2013, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -21,6 +22,10 @@
 
 #include <fstream>
 
+#ifndef _WIN32
+# include <dirent.h>
+#endif
+
 FileReader::FileReader(const std::string& filename)
 {
 	Load(filename);
@@ -71,6 +76,14 @@ std::string FileSystem::ExpandPath(const std::string& base, const std::string& f
 	if (fragment[0] == '/' || FileSystem::StartsWithWindowsDriveLetter(fragment))
 		return fragment;
 
+	// The fragment is relative to a home directory, expand that.
+	if (!fragment.compare(0, 2, "~/", 2))
+	{
+		const char* homedir = getenv("HOME");
+		if (homedir && *homedir)
+			return std::string(homedir) + '/' + fragment.substr(2);
+	}
+
 	return base + '/' + fragment;
 }