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
Add .gitreview defaultbranch for eel
[src/app-framework-main.git]
/
src
/
utils-dir.c
diff --git
a/src/utils-dir.c
b/src/utils-dir.c
index
af0bcf0
..
3c934fc
100644
(file)
--- a/
src/utils-dir.c
+++ b/
src/utils-dir.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.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-31,10
+33,6
@@
static int clean_dirfd(int dirfd)
int rc;
DIR *dir;
struct dirent *ent;
int rc;
DIR *dir;
struct dirent *ent;
- struct {
- struct dirent entry;
- char spare[PATH_MAX];
- } entry;
dir = fdopendir(dirfd);
if (dir == NULL) {
dir = fdopendir(dirfd);
if (dir == NULL) {
@@
-43,10
+41,13
@@
static int clean_dirfd(int dirfd)
}
for (;;) {
rc = -1;
}
for (;;) {
rc = -1;
- if (readdir_r(dir, &entry.entry, &ent) != 0)
- goto error;
- if (ent == NULL)
+ errno = 0;
+ ent = readdir(dir);
+ if (ent == NULL) {
+ if (errno)
+ goto error;
break;
break;
+ }
if (ent->d_name[0] == '.' && (ent->d_name[1] == 0
|| (ent->d_name[1] == '.' && ent->d_name[2] == 0)))
continue;
if (ent->d_name[0] == '.' && (ent->d_name[1] == 0
|| (ent->d_name[1] == '.' && ent->d_name[2] == 0)))
continue;
@@
-112,9
+113,10
@@
int remove_directory_at(int dirfd, const char *directory, int force)
}
/* create a directory */
}
/* create a directory */
-int create_directory_at(int dirfd, const char *directory,
in
t mode, int mkparents)
+int create_directory_at(int dirfd, const char *directory,
mode_
t mode, int mkparents)
{
{
- int rc, len, l;
+ int rc;
+ size_t len, l;
char *copy;
const char *iter;
char *copy;
const char *iter;
@@
-124,7
+126,7
@@
int create_directory_at(int dirfd, const char *directory, int mode, int mkparent
/* check parent of dest */
iter = strrchr(directory, '/');
/* check parent of dest */
iter = strrchr(directory, '/');
- len = iter ?
iter - directory
: 0;
+ len = iter ?
(size_t)(iter - directory)
: 0;
if (!len)
return rc;
copy = strndupa(directory, len);
if (!len)
return rc;
copy = strndupa(directory, len);
@@
-155,7
+157,7
@@
int create_directory_at(int dirfd, const char *directory, int mode, int mkparent
return mkdirat(dirfd, directory, mode);
}
return mkdirat(dirfd, directory, mode);
}
-int create_directory(const char *directory,
in
t mode, int mkparents)
+int create_directory(const char *directory,
mode_
t mode, int mkparents)
{
return create_directory_at(AT_FDCWD, directory, mode, mkparents);
}
{
return create_directory_at(AT_FDCWD, directory, mode, mkparents);
}