for (;;) {
struct dirent *de;
- union dirent_storage buf;
- r = readdir_r(d, &buf.de, &de);
- if (r != 0 || !de)
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ r = -errno;
+ log_debug("Failed to read directory %s: %s",
+ m->path, strerror(errno));
+ return r;
+ }
+ if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
return 0;
}
-static int add_root_directory(sd_journal *j, const char *p, const char *prefix) {
+static int add_root_directory(sd_journal *j, const char *p) {
_cleanup_closedir_ DIR *d = NULL;
Directory *m;
int r;
!path_startswith(p, "/run"))
return -EINVAL;
- if (prefix)
- p = strappenda(prefix, p);
+ if (j->prefix)
+ p = strappenda(j->prefix, p);
d = opendir(p);
if (!d)
for (;;) {
struct dirent *de;
- union dirent_storage buf;
sd_id128_t id;
- r = readdir_r(d, &buf.de, &de);
- if (r != 0 || !de)
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ r = -errno;
+ log_debug("Failed to read directory %s: %s",
+ m->path, strerror(errno));
+ return r;
+ }
+ if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
return 0;
}
-static int add_search_paths(sd_journal *j, const char *prefix) {
+static int add_search_paths(sd_journal *j) {
int r;
const char search_paths[] =
"/run/log/journal\0"
* what's actually accessible, and ignore the rest. */
NULSTR_FOREACH(p, search_paths) {
- r = add_root_directory(j, p, prefix);
+ r = add_root_directory(j, p);
if (r < 0 && r != -ENOENT) {
r = set_put_error(j, r);
if (r < 0)
* treat them as fatal. */
HASHMAP_FOREACH(f, j->files, i) {
- int r;
_cleanup_free_ char *dir;
+ int r;
dir = dirname_malloc(f->path);
if (!dir)
return -ENOMEM;
- r = add_root_directory(j, dir, NULL);
+ r = add_root_directory(j, dir);
if (r < 0) {
set_put_error(j, r);
return r;
if (!j)
return -ENOMEM;
- r = add_search_paths(j, NULL);
+ r = add_search_paths(j);
if (r < 0)
goto fail;
if (!j)
return -ENOMEM;
- r = add_search_paths(j, root);
+ j->prefix = root;
+ root = NULL;
+
+ r = add_search_paths(j);
if (r < 0)
goto fail;
if (!j)
return -ENOMEM;
- r = add_root_directory(j, path, NULL);
+ r = add_root_directory(j, path);
if (r < 0) {
set_put_error(j, r);
goto fail;
}
free(j->path);
+ free(j->prefix);
free(j->unique_field);
set_free(j->errors);
free(j);
if (j->no_new_files)
r = add_current_paths(j);
else if (j->path)
- r = add_root_directory(j, j->path, NULL);
+ r = add_root_directory(j, j->path);
else
- r = add_search_paths(j, NULL);
+ r = add_search_paths(j);
if (r < 0)
return r;
}
_public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) {
- Object *o;
size_t k;
- int r;
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
for (;;) {
JournalFile *of;
Iterator i;
+ Object *o;
const void *odata;
size_t ol;
bool found;
+ int r;
/* Proceed to next data object in the field's linked list */
if (j->unique_offset == 0) {
return r;
/* Let's do the type check by hand, since we used 0 context above. */
- if (o->object.type != OBJECT_DATA)
+ if (o->object.type != OBJECT_DATA) {
+ log_error("%s:offset " OFSfmt ": object has type %d, expected %d",
+ j->unique_file->path, j->unique_offset,
+ o->object.type, OBJECT_DATA);
return -EBADMSG;
+ }
+
+ r = journal_file_object_keep(j->unique_file, o, j->unique_offset);
+ if (r < 0)
+ return r;
r = return_data(j, j->unique_file, o, &odata, &ol);
if (r < 0)
if (found)
continue;
+ r = journal_file_object_release(j->unique_file, o, j->unique_offset);
+ if (r < 0)
+ return r;
+
r = return_data(j, j->unique_file, o, data, l);
if (r < 0)
return r;