- while (!readdir_r(directory, entry, &result) && result) {
- size_t file_name_len = strlen(result->d_name);
+ for (;;) {
+ size_t file_name_len;
+ struct dirent *result;
+
+ /*
+ * When the end of the directory stream is reached, NULL
+ * is returned and errno is kept unchanged. When an
+ * error occurs, NULL is returned and errno is set
+ * accordingly. To distinguish between the two, set
+ * errno to zero before calling readdir().
+ *
+ * On success, readdir() returns a pointer to a dirent
+ * structure. This structure may be statically
+ * allocated, do not attempt to free(3) it.
+ */
+ errno = 0;
+ result = readdir(directory);
+
+ /* Reached end of dir stream or error out. */
+ if (!result) {
+ if (errno) {
+ PERROR("Failed to enumerate the contents of path \"%s\" while loading session, readdir returned", path);
+ ret = -LTTNG_ERR_LOAD_IO_FAIL;
+ goto end;
+ }
+ break;
+ }
+
+ file_name_len = strlen(result->d_name);