db/simple: fix file corruption in the presence of mount points

If a directory is a mount point, omit the "directory: " as well. This bug is years old, but has become more visible now that mount points are persistent in the state file.

db/simple: fix file corruption in the presence of mount points
c88056ba · Max Kellermann · e7697512 · c88056ba · c88056ba
Commit c88056ba authored Dec 21, 2017 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

NEWS NEWS +2 -0

DirectorySave.cxx src/db/plugins/simple/DirectorySave.cxx +3 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.14 (not yet released)
+* database
+  - simple: fix file corruption in the presence of mount points
 ver 0.20.13 (2017/12/18)
 * output

--- a/src/db/plugins/simple/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
@@ -82,9 +82,10 @@ directory_save(BufferedOutputStream &os, const Directory &directory)
 	}
 	for (const auto &child : directory.children) {
-		os.Format(DIRECTORY_DIR "%s\n", child.GetName());
+		if (child.IsMount())
+			continue;
-		if (!child.IsMount())
+		os.Format(DIRECTORY_DIR "%s\n", child.GetName());
 		directory_save(os, child);
 	}