Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afm-user-daemon: Update to binder changes for bindings v3
[src/app-framework-main.git]
/
src
/
wgtpkg-files.c
diff --git
a/src/wgtpkg-files.c
b/src/wgtpkg-files.c
index
46ea047
..
c8571aa
100644
(file)
--- a/
src/wgtpkg-files.c
+++ b/
src/wgtpkg-files.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright
2015
IoT.bzh
+ Copyright
(C) 2015-2018
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-25,6
+25,8
@@
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
#include "verbose.h"
#include "wgtpkg-workdir.h"
#include "verbose.h"
#include "wgtpkg-workdir.h"
@@
-50,7
+52,7
@@
static unsigned int what_signature(const char *name)
return UINT_MAX;
len = sizeof(distributor_file_prefix)-1;
return UINT_MAX;
len = sizeof(distributor_file_prefix)-1;
- if (
mem
cmp(name, distributor_file_prefix, len))
+ if (
strn
cmp(name, distributor_file_prefix, len))
return 0;
if (name[len] <= '0' || name[len] > '9')
return 0;
return 0;
if (name[len] <= '0' || name[len] > '9')
return 0;
@@
-258,6
+260,7
@@
static int fill_files_rec(char name[PATH_MAX], unsigned offset)
unsigned len;
DIR *dir;
struct dirent *ent;
unsigned len;
DIR *dir;
struct dirent *ent;
+ struct stat st;
fd = openat(workdirfd, offset ? name : ".", O_DIRECTORY|O_RDONLY);
if (fd < 0) {
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);
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) {
switch (ent->d_type) {
case DT_DIR:
if (file_add_directory(name) == NULL) {