X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-files.c;h=0b55670ae0a046f875b6dab9dbcf2d6cfaa279bd;hb=512e870e35747c6114e0dd5e0d94060b3b3cf6a5;hp=ed63726701242941c1c9e607b067dd0c9eef20f3;hpb=e2de563d1ecb4585ce68521bd42f3ef45ac79f16;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-files.c b/src/wgtpkg-files.c
index ed63726..0b55670 100644
--- a/src/wgtpkg-files.c
+++ b/src/wgtpkg-files.c
@@ -1,5 +1,7 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -18,14 +20,17 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <syslog.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 
 #include "verbose.h"
-#include "wgtpkg.h"
+#include "wgtpkg-workdir.h"
+#include "wgtpkg-files.h"
 
 struct fdb {
 	unsigned int count;
@@ -47,7 +52,7 @@ static unsigned int what_signature(const char *name)
 		return UINT_MAX;
 
 	len = sizeof(distributor_file_prefix)-1;
-	if (memcmp(name, distributor_file_prefix, len))
+	if (strncmp(name, distributor_file_prefix, len))
 		return 0;
 	if (name[len] <= '0' || name[len] > '9')
 		return 0;
@@ -55,7 +60,7 @@ static unsigned int what_signature(const char *name)
 	while ('0' <= name[len] && name[len] <= '9') {
 		nid = 10 * id + (unsigned int)(name[len++] - '0');
 		if (nid < id || nid == UINT_MAX) {
-			syslog(LOG_WARNING, "number too big for %s", name);
+			WARNING("number too big for %s", name);
 			return 0;
 		}
 		id = nid;
@@ -249,11 +254,13 @@ void file_clear_flags()
 		allfiles.files[i]->flags &= flag_signature;
 }
 
-static int fill_files_rec(char name[PATH_MAX], int offset)
+static int fill_files_rec(char name[PATH_MAX], unsigned offset)
 {
-	int len, err, fd;
+	int err, fd;
+	unsigned len;
 	DIR *dir;
 	struct dirent *ent;
+	struct stat st;
 
 	fd = openat(workdirfd, offset ? name : ".", O_DIRECTORY|O_RDONLY);
 	if (fd < 0) {
@@ -271,7 +278,7 @@ static int fill_files_rec(char name[PATH_MAX], int offset)
 
 	ent = readdir(dir);
 	while (ent != NULL) {
-		len = strlen(ent->d_name);
+		len = (unsigned)strlen(ent->d_name);
 		if (ent->d_name[0] == '.' && (len == 1 || 
 			(ent->d_name[1] == '.' && len == 2)))
 			;
@@ -282,6 +289,13 @@ static int fill_files_rec(char name[PATH_MAX], int 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) {