X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ffileutils.cpp;h=8f78745fa7b0000b15b9f3e6dc6905f3a3de82fb;hb=581d1d8fa0ef62e20409543570390613c78e6f5b;hp=6c98ba30071893a3a201639f78a15a176caa489a;hpb=5b152cfcd993119c0d0ef87b73b3b0f20c940cdc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/fileutils.cpp b/src/fileutils.cpp index 6c98ba300..8f78745fa 100644 --- a/src/fileutils.cpp +++ b/src/fileutils.cpp @@ -1,7 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013 Peter Powell + * Copyright (C) 2013, 2019-2020 Sadie Powell + * Copyright (C) 2013 Attila Molnar * * 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 @@ -75,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; }