chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: always write net.ipv4.conf.all.xyz= in addition to net.ipv4.conf.default...
[elogind.git]
/
src
/
journal
/
test-catalog.c
diff --git
a/src/journal/test-catalog.c
b/src/journal/test-catalog.c
index 863b9f4b51b48bc11e214d127ebe1bcdc336c464..967ab6756b323c1b887c801558bbf65ed32b3fa0 100644
(file)
--- 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 <stdlib.h>
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "util.h"
#include "log.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";
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);
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 const char* database = NULL;
static void test_catalog_update(void) {
+ static char name[] = "/tmp/test-catalog.XXXXXX";
int r;
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;
assert(r >= 0);
database = name;
@@
-121,7
+124,7
@@
static void test_catalog_update(void) {
}
static void test_catalog_file_lang(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"));
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("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[]) {
}
int main(int argc, char *argv[]) {
@@
-148,7
+157,10
@@
int main(int argc, char *argv[]) {
setlocale(LC_ALL, "de_DE.UTF-8");
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();
test_catalog_importing();
@@
-166,7
+178,5
@@
int main(int argc, char *argv[]) {
if (database)
unlink(database);
if (database)
unlink(database);
- test_catalog_file_lang();
-
return 0;
}
return 0;
}