From d208424fdb4e8b516aff2a5a0d03fc7411909471 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 11 May 2018 15:28:43 +0200
Subject: Fix relative URI serialisation

---
 src/serd_internal.h | 11 +++++++++--
 src/uri.c           | 12 ++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/serd_internal.h b/src/serd_internal.h
index cfcdc82c..52dd31ed 100644
--- a/src/serd_internal.h
+++ b/src/serd_internal.h
@@ -431,9 +431,9 @@ uri_path_at(const SerdURI* uri, size_t i)
 	}
 }
 
-/** Return true iff `uri` is within the base of `root` */
+/** Return true iff `uri` shares path components with `root` */
 static inline bool
-uri_is_under(const SerdURI* uri, const SerdURI* root)
+uri_is_related(const SerdURI* uri, const SerdURI* root)
 {
 	if (!root || !root->scheme.len ||
 	    !chunk_equals(&root->scheme, &uri->scheme) ||
@@ -456,6 +456,13 @@ uri_is_under(const SerdURI* uri, const SerdURI* root)
 	return true;
 }
 
+/** Return true iff `uri` is within the base of `root` */
+static inline bool
+uri_is_under(const SerdURI* uri, const SerdURI* root)
+{
+	return uri->path.len >= root->path.len && uri_is_related(uri, root);
+}
+
 static inline bool
 is_uri_scheme_char(const uint8_t c)
 {
diff --git a/src/uri.c b/src/uri.c
index 7b172e42..e6f03547 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -433,8 +433,6 @@ write_rel_path(SerdSink       sink,
 
 	if (i == path_len && i == base_len) {  // Paths are identical
 		return 0;
-	} else if (last_shared_sep == 0) {  // No common components
-		return write_path_tail(sink, stream, uri, 0);
 	}
 
 	// Find the number of up references ("..") required
@@ -451,6 +449,10 @@ write_rel_path(SerdSink       sink,
 		len += sink("../", 3, stream);
 	}
 
+	if (last_shared_sep == 0 && up == 0) {
+		len += sink("/", 1, stream);
+	}
+
 	// Write suffix
 	return len += write_path_tail(sink, stream, uri, last_shared_sep + 1);
 }
@@ -464,8 +466,10 @@ serd_uri_serialise_relative(const SerdURI* uri,
                             SerdSink       sink,
                             void*          stream)
 {
-	size_t     len      = 0;
-	const bool relative = uri_is_under(uri, root ? root : base);
+	size_t     len = 0;
+	const bool relative =
+		root ? uri_is_under(uri, root) : uri_is_related(uri, base);
+
 	if (relative) {
 		len = write_rel_path(sink, stream, uri, base);
 	}
-- 
cgit v1.2.1