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
don't change of directory anymore
[src/app-framework-main.git]
/
src
/
wgtpkg-files.c
diff --git
a/src/wgtpkg-files.c
b/src/wgtpkg-files.c
index
06aac83
..
8840fa9
100644
(file)
--- a/
src/wgtpkg-files.c
+++ b/
src/wgtpkg-files.c
@@
-21,6
+21,7
@@
#include <syslog.h>
#include <dirent.h>
#include <stdio.h>
#include <syslog.h>
#include <dirent.h>
#include <stdio.h>
+#include <fcntl.h>
#include "wgtpkg.h"
#include "wgtpkg.h"
@@
-248,20
+249,23
@@
void file_clear_flags()
static int fill_files_rec(char name[PATH_MAX], int offset)
{
static int fill_files_rec(char name[PATH_MAX], int offset)
{
- int len, err;
+ int len, err
, fd
;
DIR *dir;
struct dirent *ent;
DIR *dir;
struct dirent *ent;
- if (offset == 0)
- dir = opendir(".");
- else {
- dir = opendir(name);
- name[offset++] = '/';
+ fd = openat(workdirfd, offset ? name : ".", O_DIRECTORY|O_RDONLY);
+ if (fd < 0) {
+ syslog(LOG_ERR, "openat %.*s failed in fill_files_rec", offset, name);
+ return -1;
}
}
+ dir = fdopendir(fd);
if (!dir) {
if (!dir) {
- syslog(LOG_ERR, "opendir %.*s failed in zwr", offset, name);
+ syslog(LOG_ERR, "opendir %.*s failed in fill_files_rec", offset, name);
+ close(fd);
return -1;
}
return -1;
}
+ if (offset)
+ name[offset++] = '/';
ent = readdir(dir);
while (ent != NULL) {
ent = readdir(dir);
while (ent != NULL) {