From cd522f524dd95824ade3a41f1aeddf428fa7cc19 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 24 Feb 2017 13:50:29 +0100
Subject: [PATCH] fs/Traits: allow base to end with a slash in Relative()

Fixes false negatives:

 http://foo/dav/example.ogg mismatches http://foo/dav/

.. because StringAfterPrefix() returns just "example.ogg", without
trailing slash (it existed, but was eaten already by the base
matcher).
---
 src/fs/Traits.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx
index c3f10a51a..45a2ffacf 100644
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -99,9 +99,16 @@ RelativePathImpl(typename Traits::const_pointer_type base,
 		return nullptr;
 
 	if (*other != 0) {
-		if (!Traits::IsSeparator(*other))
+		if (!Traits::IsSeparator(*other)) {
+			if (*base != 0 && Traits::IsSeparator(other[-1]))
+				/* "other" has no more slash, but the
+				   matching base ended with a slash:
+				   enough to detect a match */
+				return other;
+
 			/* mismatch */
 			return nullptr;
+		}
 
 		/* skip remaining path separators */
 		do {