Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-08-02 11:07:40 +02:00
19 changed files with 66 additions and 47 deletions

View File

@@ -35,6 +35,7 @@
#include "event/Call.hxx"
#include "event/DeferEvent.hxx"
#include "event/TimerEvent.hxx"
#include "util/ASCII.hxx"
#include "util/StringCompare.hxx"
extern "C" {
@@ -404,11 +405,10 @@ NfsStorage::OpenDirectory(const char *uri_utf8)
static std::unique_ptr<Storage>
CreateNfsStorageURI(EventLoop &event_loop, const char *base)
{
if (strncmp(base, "nfs://", 6) != 0)
const char *p = StringAfterPrefixCaseASCII(base, "nfs://");
if (p == nullptr)
return nullptr;
const char *p = base + 6;
const char *mount = strchr(p, '/');
if (mount == nullptr)
throw std::runtime_error("Malformed nfs:// URI");