Merge branch 'v0.20.x'

2018-08-02 11:07:40 +02:00
parent 22192adbc8 906972973e
commit cf471e830f
19 changed files with 66 additions and 47 deletions
--- a/src/storage/plugins/SmbclientStorage.cxx
+++ b/src/storage/plugins/SmbclientStorage.cxx
@@ -27,6 +27,7 @@
 #include "fs/Traits.hxx"
 #include "thread/Mutex.hxx"
 #include "system/Error.hxx"
+#include "util/ASCII.hxx"
 #include "util/StringCompare.hxx"
 #include "util/ScopeExit.hxx"

@@ -183,7 +184,7 @@ SmbclientDirectoryReader::GetInfo(gcc_unused bool follow)
 static std::unique_ptr<Storage>
 CreateSmbclientStorageURI(gcc_unused EventLoop &event_loop, const char *base)
 {
-	if (strncmp(base, "smb://", 6) != 0)
+	if (!StringStartsWithCaseASCII(base, "smb://"))
 		return nullptr;

 	SmbclientInit();