From 4b8268f843b0da1cfe1995d93a0b1f95faccc454 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sun, 15 Dec 2013 21:07:47 -0500 Subject: catalog: fix language detection Detection would fail if language was not specified in the filename but a dot appeared somewhere higher in the path. --- src/journal/catalog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/journal/catalog.c') diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 2be81aa2f7..e3a3354ab7 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -150,10 +150,10 @@ int catalog_file_lang(const char* filename, char **lang) { return 0; beg = end - 1; - while (beg > filename && *beg != '.') + while (beg > filename && *beg != '.' && *beg != '/' && end - beg < 32) beg --; - if (beg <= filename || end <= beg + 1 || end - beg > 32) + if (*beg != '.' || end <= beg + 1) return 0; _lang = strndup(beg + 1, end - beg - 1); -- cgit v1.2.3-54-g00ecf