X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-catalog.c;h=967ab6756b323c1b887c801558bbf65ed32b3fa0;hb=d636d376796ec61c1c14fa619c80d4ac62e08a19;hp=5db5bed8de0135826130133ed5c0b45c7cc2ac7c;hpb=143bfdaf0b890fa7acadf02d1eafacaef1b696bd;p=elogind.git diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index 5db5bed8d..967ab6756 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "util.h" #include "log.h" @@ -45,7 +46,9 @@ static void test_import(Hashmap *h, struct strbuf *sb, const char* contents, ssize_t size, int code) { int r; char name[] = "/tmp/test-catalog.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); + _cleanup_close_ int fd; + + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); assert(fd >= 0); assert_se(write(fd, contents, size) == size); @@ -98,10 +101,10 @@ static void test_catalog_importing(void) { static const char* database = NULL; static void test_catalog_update(void) { + static char name[] = "/tmp/test-catalog.XXXXXX"; int r; - static char name[] = "/tmp/test-catalog.XXXXXX"; - r = mkstemp(name); + r = mkostemp_safe(name, O_RDWR|O_CLOEXEC); assert(r >= 0); database = name; @@ -120,13 +123,44 @@ static void test_catalog_update(void) { assert(r >= 0); } +static void test_catalog_file_lang(void) { + _cleanup_free_ char *lang = NULL, *lang2 = NULL, *lang3 = NULL, *lang4 = NULL; + + assert_se(catalog_file_lang("systemd.de_DE.catalog", &lang) == 1); + assert_se(streq(lang, "de_DE")); + + assert_se(catalog_file_lang("systemd..catalog", &lang2) == 0); + assert_se(lang2 == NULL); + + assert_se(catalog_file_lang("systemd.fr.catalog", &lang2) == 1); + assert_se(streq(lang2, "fr")); + + assert_se(catalog_file_lang("systemd.fr.catalog.gz", &lang3) == 0); + assert_se(lang3 == NULL); + + assert_se(catalog_file_lang("systemd.01234567890123456789012345678901.catalog", &lang3) == 0); + assert_se(lang3 == NULL); + + assert_se(catalog_file_lang("systemd.0123456789012345678901234567890.catalog", &lang3) == 1); + assert_se(streq(lang3, "0123456789012345678901234567890")); + + assert_se(catalog_file_lang("/x/y/systemd.catalog", &lang4) == 0); + assert_se(lang4 == NULL); + + assert_se(catalog_file_lang("/x/y/systemd.ru_RU.catalog", &lang4) == 1); + assert_se(streq(lang4, "ru_RU")); +} + int main(int argc, char *argv[]) { _cleanup_free_ char *text = NULL; int r; setlocale(LC_ALL, "de_DE.UTF-8"); - log_set_max_level(LOG_DEBUG); + log_parse_environment(); + log_open(); + + test_catalog_file_lang(); test_catalog_importing();