From 7f9ee00980d8d8eceea834695e1415de48c57704 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 1 Nov 2009 17:49:49 +0100
Subject: [PATCH] directory_save: partially revert the g_str_has_prefix() patch
---
src/directory_save.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/directory_save.c b/src/directory_save.c
index cb740c0c8..e6d3649d0 100644
--- a/src/directory_save.c
+++ b/src/directory_save.c
@@ -123,7 +123,7 @@ directory_load_subdir(FILE *fp, struct directory *parent, const char *name,
}
}
- if (strcmp(line, DIRECTORY_BEGIN) != 0) {
+ if (!g_str_has_prefix(line, DIRECTORY_BEGIN)) {
g_set_error(error_r, directory_quark(), 0,
"Malformed line: %s", line);
directory_free(directory);
@@ -147,7 +147,7 @@ directory_load(FILE *fp, struct directory *directory,
bool success;
while ((line = read_text_line(fp, buffer)) != NULL &&
- strcmp(line, DIRECTORY_END) != 0) {
+ !g_str_has_prefix(line, DIRECTORY_END)) {
if (g_str_has_prefix(line, DIRECTORY_DIR)) {
struct directory *subdir =
directory_load_subdir(fp, directory,