From: José Bollo <jose.bollo@iot.bzh>
Date: Wed, 22 Feb 2017 17:47:48 +0000 (+0100)
Subject: Fix readdir that doesn't return dt_type
X-Git-Tag: x-last-without-systemd~18
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=512e870e35747c6114e0dd5e0d94060b3b3cf6a5

Fix readdir that doesn't return dt_type

This is an incomplete fix. More readdir calls
exists that should be treated.

Change-Id: Ic9ed98c7695a7c3d15136d0fe5eb9b5634f74d09
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/wgtpkg-files.c b/src/wgtpkg-files.c
index cce6a04..0b55670 100644
--- a/src/wgtpkg-files.c
+++ b/src/wgtpkg-files.c
@@ -25,6 +25,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 
 #include "verbose.h"
 #include "wgtpkg-workdir.h"
@@ -258,6 +260,7 @@ static int fill_files_rec(char name[PATH_MAX], unsigned offset)
 	unsigned len;
 	DIR *dir;
 	struct dirent *ent;
+	struct stat st;
 
 	fd = openat(workdirfd, offset ? name : ".", O_DIRECTORY|O_RDONLY);
 	if (fd < 0) {
@@ -286,6 +289,13 @@ static int fill_files_rec(char name[PATH_MAX], unsigned offset)
 			return -1;
 		} else {
 			memcpy(name + offset, ent->d_name, 1+len);
+			if (ent->d_type == DT_UNKNOWN) {
+				fstatat(fd, ent->d_name, &st, 0);
+				if (S_ISREG(st.st_mode))
+					ent->d_type = DT_REG;
+				else if (S_ISDIR(st.st_mode))
+					ent->d_type = DT_DIR;
+			}
 			switch (ent->d_type) {
 			case DT_DIR:
 				if (file_add_directory(name) == NULL) {