storage/nfs: MapUTF8("") returns the full URL including parameters

MaxKellermann · MaxKellermann · commit 63ad12bb8976 · 2025-01-30T20:04:19.000+01:00
Closes #2154
diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx
@@ -239,7 +239,11 @@ std::string
 NfsStorage::MapUTF8(std::string_view uri_utf8) const noexcept
 {
 	if (uri_utf8.empty())
-		return base;
+		/* this special case returns the original "nfs://" URI
+                   with all parameters (they are missing in the "base"
+                   variable); this is important because MapUTF8("") is
+                   called for the state file */
+		return url;
 
 	return PathTraitsUTF8::Build(base, uri_utf8);
 }

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,11 @@ std::string`
`239`	`239`	`NfsStorage::MapUTF8(std::string_view uri_utf8) const noexcept`
`240`	`240`	`{`
`241`	`241`	`if (uri_utf8.empty())`
`242`		`- return base;`
	`242`	`+ /* this special case returns the original "nfs://" URI`
	`243`	`+ with all parameters (they are missing in the "base"`
	`244`	`+ variable); this is important because MapUTF8("") is`
	`245`	`+ called for the state file */`
	`246`	`+ return url;`
`243`	`247`
`244`	`248`	`return PathTraitsUTF8::Build(base, uri_utf8);`
`245`	`249`	`}`