{
int rc, sfd;
DIR *dir;
- struct dirent dent, *e;
+ struct dirent *dent;
struct stat st;
size_t i, j;
struct locale_folder *f;
/* enumerate the entries */
for(;;) {
/* next entry */
- rc = readdir_r(dir, &dent, &e);
- if (rc < 0) {
- /* error */
- closedir(dir);
- return rc;
- }
- if (e == NULL) {
+ errno = 0;
+ dent = readdir(dir);
+ if (dent == NULL) {
/* end of entries */
closedir(dir);
+ if (errno != 0)
+ return -1;
break;
}
- if (dent.d_type == DT_DIR || (dent.d_type == DT_UNKNOWN && fstatat(sfd, dent.d_name, &st, 0) == 0 && S_ISDIR(st.st_mode))) {
+ if (dent->d_type == DT_DIR || (dent->d_type == DT_UNKNOWN && fstatat(sfd, dent->d_name, &st, 0) == 0 && S_ISDIR(st.st_mode))) {
/* directory aka folder */
- if (dent.d_name[0] == '.' && (dent.d_name[1] == 0 || (dent.d_name[1] == '.' && dent.d_name[2] == 0))) {
+ if (dent->d_name[0] == '.' && (dent->d_name[1] == 0 || (dent->d_name[1] == '.' && dent->d_name[2] == 0))) {
/* nothing to do for special directories, basic detection, improves if needed */
} else {
- rc = add_folder(container, dent.d_name);
+ rc = add_folder(container, dent->d_name);
if (rc < 0) {
closedir(dir);
return rc;
*/
struct locale_root *locale_root_addref(struct locale_root *root)
{
- root->refcount++;
+ __atomic_add_fetch(&root->refcount, 1, __ATOMIC_RELAXED);
return root;
}
*/
static void internal_unref(struct locale_root *root)
{
- if (!--root->intcount) {
+ if (!__atomic_sub_fetch(&root->intcount, 1, __ATOMIC_RELAXED)) {
clear_container(&root->container);
close(root->rootfd);
free(root);
{
size_t i;
- if (root != NULL && !--root->refcount) {
+ if (root && !__atomic_sub_fetch(&root->refcount, 1, __ATOMIC_RELAXED)) {
/* clear circular references through searchs */
for (i = 0 ; i < LRU_COUNT ; i++)
locale_search_unref(root->lru[i]);
errno = ENOMEM;
} else {
/* init */
- root->intcount++;
+ __atomic_add_fetch(&root->intcount, 1, __ATOMIC_RELAXED);
search->root = root;
search->head = NULL;
search->refcount = 1;
*/
struct locale_search *locale_search_addref(struct locale_search *search)
{
- search->refcount++;
+ __atomic_add_fetch(&search->refcount, 1, __ATOMIC_RELAXED);
return search;
}
{
struct locale_search_node *it, *nx;
- if (search && !--search->refcount) {
+ if (search && !__atomic_sub_fetch(&search->refcount, 1, __ATOMIC_RELAXED)) {
it = search->head;
while(it != NULL) {
nx = it->next;