github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-23 11:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

support file systems without DT_DIR

Browse Source 
reported by @matbor for CentOS
This commit is contained in:
Jan-Piet Mens
2018-02-13 06:48:44 +01:00
parent 002285d4df
commit d72b66575a
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage.c
+20 -1
View File
@@ -28,6 +28,7 @@
#include <unistd.h>
#include <glob.h>
#include <ctype.h>
#include <assert.h>
#include <sys/stat.h>
#include "utstring.h"
#include "storage.h"
@@ -422,7 +423,25 @@ static void ls(char *path, JsonNode *obj)
}
while ((dp = readdir(dirp)) != NULL) {
if ((*dp->d_name != '.') && (dp->d_type == DT_DIR)) {
bool is_dir = false;
/* XFS doesn't support d_type, and it's used on CentOS 7.
* Ensure we can determine whether something's a directory.
*/
if (dp->d_type == DT_DIR) {
is_dir = true;
} else {
struct stat st;
static UT_string *fullp = NULL;
utstring_renew(fullp);
utstring_printf(fullp, "%s/%s", path, dp->d_name);
assert(stat(UB(fullp), &st) != -1);
is_dir = S_ISDIR(st.st_mode);
}
if (is_dir && (*dp->d_name != '.')) {
json_append_element(jarr, json_mkstring(dp->d_name));
}
}