emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-create: replace nftw by an implementation that traverses the directory tree in an alphabetic order.

Browse Source
This commit is contained in:
Enno Boland
2018-07-07 12:15:00 +02:00
parent 3f251bea74
commit 3ef932de2f
1 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bin/xbps-create/main.c
View File

@ -40,6 +40,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <libgen.h> #include <libgen.h>
#include <locale.h> #include <locale.h>
#include <dirent.h>
#include <xbps.h> #include <xbps.h>
#include "queue.h" #include "queue.h"
@ -301,7 +302,7 @@ entry_is_conf_file(const char *file)
} }
static int static int
ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _unused) ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir _unused)
{ {
struct xentry *xe = NULL; struct xentry *xe = NULL;
xbps_dictionary_t fileinfo = NULL; xbps_dictionary_t fileinfo = NULL;
@ -346,7 +347,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _u
goto out; goto out;
} }
if (type == FTW_SL) { if (S_ISLNK(sb->st_mode)) {
/* /*
* Symlinks. * Symlinks.
* *
@ -410,7 +411,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _u
assert(xe->target); assert(xe->target);
assert(xbps_dictionary_get(fileinfo, "target")); assert(xbps_dictionary_get(fileinfo, "target"));
free(buf); free(buf);
} else if (type == FTW_F) { } else if (S_ISREG(sb->st_mode)) {
struct xentry *xep; struct xentry *xep;
bool hlink = false; bool hlink = false;
xbps_object_iterator_t iter; xbps_object_iterator_t iter;
@ -477,7 +478,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf _u
xbps_dictionary_set_uint64(fileinfo, "mtime", sb->st_mtime); xbps_dictionary_set_uint64(fileinfo, "mtime", sb->st_mtime);
xe->mtime = (uint64_t)sb->st_mtime; xe->mtime = (uint64_t)sb->st_mtime;
} else if (type == FTW_D || type == FTW_DP) { } else if (S_ISDIR(sb->st_mode)) {
/* directory */ /* directory */
xbps_dictionary_set_cstring_nocopy(fileinfo, "type", "dirs"); xbps_dictionary_set_cstring_nocopy(fileinfo, "type", "dirs");
xe->type = strdup("dirs"); xe->type = strdup("dirs");
@ -490,6 +491,46 @@ out:
return 0; return 0;
} }
static int
walk_dir(const char *path,
int (*fn) (const char *, const struct stat *sb, const struct dirent *dir)) {
int rv, i;
struct dirent **list;
char tmp_path[PATH_MAX] = { 0 };
struct stat sb;
rv = scandir(path, &list, NULL, alphasort);
for(i = rv - 1; i >= 0; i--) {
if(strcmp(list[i]->d_name, ".") == 0 || strcmp(list[i]->d_name, "..") == 0)
continue;
if (strlen(path) + strlen(list[i]->d_name) + 1 >= PATH_MAX - 1) {
errno = ENAMETOOLONG;
break;
}
strncpy(tmp_path, path, PATH_MAX - 1);
strncat(tmp_path, "/", PATH_MAX - 1 - strlen(tmp_path));
strncat(tmp_path, list[i]->d_name, PATH_MAX - 1 - strlen(tmp_path));
if (lstat(tmp_path, &sb) < 0) {
break;
}
if (S_ISDIR(sb.st_mode)) {
if(walk_dir(tmp_path, fn) < 0) {
rv = -1;
break;
}
}
rv = fn(tmp_path, &sb, list[i]);
if (rv != 0) {
break;
}
}
free(list);
return rv;
}
static void static void
process_xentry(const char *key, const char *mutable_files) process_xentry(const char *key, const char *mutable_files)
{ {
@ -556,7 +597,7 @@ process_xentry(const char *key, const char *mutable_files)
static void static void
process_destdir(const char *mutable_files) process_destdir(const char *mutable_files)
{ {
if (nftw(".", ftw_cb, 20, FTW_PHYS) != 0) if (walk_dir(".", ftw_cb) < 0)
die("failed to process destdir files (nftw):"); die("failed to process destdir files (nftw):");
/* Process regular files */ /* Process regular files */