moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 07:48:50 -05:00
Code Issues Releases Wiki Activity

hook.c: replace readdir_r with readdir

Browse Source 
glibc 2.24 deprecates readdir_r.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2016-06-27 22:23:42 -04:00 committed by Allan McRae
parent af83a58574
commit c981f5ad76
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libalpm/hook.c
View File

@ -623,10 +623,9 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
int ret = 0; int ret = 0;
for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) {
int err;
char path[PATH_MAX]; char path[PATH_MAX];
size_t dirlen; size_t dirlen;
struct dirent entry, *result; struct dirent *entry;
DIR *d; DIR *d;
if((dirlen = strlen(i->data)) >= PATH_MAX) { if((dirlen = strlen(i->data)) >= PATH_MAX) {
@ -648,35 +647,35 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
} }
} }
while((err = readdir_r(d, &entry, &result)) == 0 && result) { while((errno = 0, entry = readdir(d))) {
struct _alpm_hook_cb_ctx ctx = { handle, NULL }; struct _alpm_hook_cb_ctx ctx = { handle, NULL };
struct stat buf; struct stat buf;
size_t name_len; size_t name_len;
if(strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
continue; continue;
} }
if((name_len = strlen(entry.d_name)) >= PATH_MAX - dirlen) { if((name_len = strlen(entry->d_name)) >= PATH_MAX - dirlen) {
_alpm_log(handle, ALPM_LOG_ERROR, _("could not open file: %s%s: %s\n"), _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file: %s%s: %s\n"),
path, entry.d_name, strerror(ENAMETOOLONG)); path, entry->d_name, strerror(ENAMETOOLONG));
ret = -1; ret = -1;
continue; continue;
} }
memcpy(path + dirlen, entry.d_name, name_len + 1); memcpy(path + dirlen, entry->d_name, name_len + 1);
if(name_len < suflen if(name_len < suflen
|| strcmp(entry.d_name + name_len - suflen, suffix) != 0) { || strcmp(entry->d_name + name_len - suflen, suffix) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path);
continue; continue;
} }
if(find_hook(hooks, entry.d_name)) { if(find_hook(hooks, entry->d_name)) {
_alpm_log(handle, ALPM_LOG_DEBUG, "skipping overridden hook %s\n", path); _alpm_log(handle, ALPM_LOG_DEBUG, "skipping overridden hook %s\n", path);
continue; continue;
} }
if(fstatat(dirfd(d), entry.d_name, &buf, 0) != 0) { if(fstatat(dirfd(d), entry->d_name, &buf, 0) != 0) {
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(handle, ALPM_LOG_ERROR,
_("could not stat file %s: %s\n"), path, strerror(errno)); _("could not stat file %s: %s\n"), path, strerror(errno));
ret = -1; ret = -1;
@ -700,11 +699,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when)
continue; continue;
} }
STRDUP(ctx.hook->name, entry.d_name, ret = -1; closedir(d); goto cleanup); STRDUP(ctx.hook->name, entry->d_name, ret = -1; closedir(d); goto cleanup);
hooks = alpm_list_add(hooks, ctx.hook); hooks = alpm_list_add(hooks, ctx.hook);
} }
if(errno != 0) {
if(err != 0) {
_alpm_log(handle, ALPM_LOG_ERROR, _("could not read directory: %s: %s\n"), _alpm_log(handle, ALPM_LOG_ERROR, _("could not read directory: %s: %s\n"),
(char *) i->data, strerror(errno)); (char *) i->data, strerror(errno));
ret = -1; ret = -1;