X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-catalog.c;h=5fe2f6a2697e6bb65ba264b2c274e297a013293a;hb=cc821d02a37c8c76aaf15bae2d33fee1bdc4b2e0;hp=863b9f4b51b48bc11e214d127ebe1bcdc336c464;hpb=c7332b0844e28d9b70c3c763b929f105c1056fe8;p=elogind.git

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 863b9f4b5..5fe2f6a26 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #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);
 
@@ -59,7 +62,7 @@ static void test_catalog_importing(void) {
         Hashmap *h;
         struct strbuf *sb;
 
-        assert_se(h = hashmap_new(catalog_hash_func, catalog_compare_func));
+        assert_se(h = hashmap_new(&catalog_hash_ops));
         assert_se(sb = strbuf_new());
 
 #define BUF "xxx"
@@ -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;
@@ -121,7 +124,7 @@ static void test_catalog_update(void) {
 }
 
 static void test_catalog_file_lang(void) {
-        _cleanup_free_ char *lang = NULL, *lang2 = NULL, *lang3 = NULL;
+        _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"));
@@ -140,6 +143,12 @@ static void test_catalog_file_lang(void) {
 
         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[]) {
@@ -148,7 +157,10 @@ int main(int argc, char *argv[]) {
 
         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();
 
@@ -166,7 +178,5 @@ int main(int argc, char *argv[]) {
         if (database)
                 unlink(database);
 
-        test_catalog_file_lang();
-
         return 0;
 }