journal: properly detect language specified in line
... it turns out that the duplicates in our own catalog were not real duplicates, but translations.
This commit is contained in:
parent
e3b9d9c802
commit
baf167ee0a
2
TODO
2
TODO
|
@ -709,6 +709,8 @@ External:
|
||||||
|
|
||||||
* fedora: update policy to declare access mode and ownership of unit files to root:root 0644, and add an rpmlint check for it
|
* fedora: update policy to declare access mode and ownership of unit files to root:root 0644, and add an rpmlint check for it
|
||||||
|
|
||||||
|
* register catalog database signature as file magic
|
||||||
|
|
||||||
Regularly:
|
Regularly:
|
||||||
|
|
||||||
* look for close() vs. close_nointr() vs. close_nointr_nofail()
|
* look for close() vs. close_nointr() vs. close_nointr_nofail()
|
||||||
|
|
|
@ -159,6 +159,37 @@ int catalog_file_lang(const char* filename, char **lang) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int catalog_entry_lang(const char* filename, int line,
|
||||||
|
const char* t, const char* deflang, char **lang) {
|
||||||
|
size_t c;
|
||||||
|
|
||||||
|
c = strlen(t);
|
||||||
|
if (c == 0) {
|
||||||
|
log_error("[%s:%u] Language too short.", filename, line);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
if (c > 31) {
|
||||||
|
log_error("[%s:%u] language too long.", filename, line);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deflang) {
|
||||||
|
if (streq(t, deflang)) {
|
||||||
|
log_warning("[%s:%u] language specified unnecessarily",
|
||||||
|
filename, line);
|
||||||
|
return 0;
|
||||||
|
} else
|
||||||
|
log_warning("[%s:%u] language differs from default for file",
|
||||||
|
filename, line);
|
||||||
|
}
|
||||||
|
|
||||||
|
*lang = strdup(t);
|
||||||
|
if (!*lang)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
|
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
|
||||||
_cleanup_fclose_ FILE *f = NULL;
|
_cleanup_fclose_ FILE *f = NULL;
|
||||||
_cleanup_free_ char *payload = NULL;
|
_cleanup_free_ char *payload = NULL;
|
||||||
|
@ -238,25 +269,9 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
|
||||||
if (with_language) {
|
if (with_language) {
|
||||||
t = strstrip(line + 2 + 1 + 32 + 1);
|
t = strstrip(line + 2 + 1 + 32 + 1);
|
||||||
|
|
||||||
c = strlen(t);
|
r = catalog_entry_lang(path, n, t, deflang, &lang);
|
||||||
if (c <= 0) {
|
if (r < 0)
|
||||||
log_error("[%s:%u] Language too short.", path, n);
|
return r;
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
if (c > 31) {
|
|
||||||
log_error("[%s:%u] language too long.", path, n);
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (deflang) {
|
|
||||||
log_warning("[%s:%u] language %s", path, n,
|
|
||||||
streq(t, deflang) ?
|
|
||||||
"specified unnecessarily" :
|
|
||||||
"differs from default for file");
|
|
||||||
lang = strdup(t);
|
|
||||||
if (!lang)
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
got_id = true;
|
got_id = true;
|
||||||
|
|
Loading…
Reference in New Issue