X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flocale-root.c;h=0cf14eeaa569ac31c45835cf97714d21512adf89;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=ead820b4d4cad8b252b8c1423f11b2dbe8f2f2dd;hpb=335959621b8ffa33f66f55e0dea1c08aaea75775;p=src%2Fapp-framework-binder.git diff --git a/src/locale-root.c b/src/locale-root.c index ead820b4..0cf14eea 100644 --- a/src/locale-root.c +++ b/src/locale-root.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright (C) 2015-2020 "IoT.bzh" author: José Bollo @@ -32,6 +32,7 @@ #include #include "locale-root.h" +#include "subpath.h" /* * Implementation of folder based localisation as described here: @@ -46,7 +47,7 @@ static const char locales[] = "locales/"; struct locale_folder { struct locale_folder *parent; size_t length; - char name[1]; + char name[]; }; struct locale_container { @@ -66,7 +67,7 @@ struct locale_search { struct locale_root *root; struct locale_search_node *head; int refcount; - char definition[1]; + char definition[]; }; struct locale_root { @@ -78,62 +79,6 @@ struct locale_root { struct locale_search *default_search; }; -/* a valid subpath is a relative path not looking deeper than root using .. */ -static int validsubpath(const char *subpath) -{ - int l = 0, i = 0; - - /* absolute path is not valid */ - if (subpath[i] == '/') - return 0; - - /* inspect the path */ - while(subpath[i]) { - switch(subpath[i++]) { - case '.': - if (!subpath[i]) - break; - if (subpath[i] == '/') { - i++; - break; - } - if (subpath[i++] == '.') { - if (!subpath[i]) { - l--; - break; - } - if (subpath[i++] == '/') { - l--; - break; - } - } - default: - while(subpath[i] && subpath[i] != '/') - i++; - if (l >= 0) - l++; - case '/': - break; - } - } - return l >= 0; -} - -/* - * Normalizes and checks the 'subpath'. - * Removes any starting '/' and checks that 'subpath' - * does not contains sequence of '..' going deeper than - * root. - * Returns the normalized subpath or NULL in case of - * invalid subpath. - */ -static const char *normalsubpath(const char *subpath) -{ - while(*subpath == '/') - subpath++; - return validsubpath(subpath) ? subpath : NULL; -} - /* * Clear a container content */ @@ -157,7 +102,7 @@ static int add_folder(struct locale_container *container, const char *name) if (folders != NULL) { container->folders = folders; length = strlen(name); - folders[count] = malloc(sizeof **folders + length); + folders[count] = malloc(sizeof **folders + 1 + length); if (folders[count] != NULL) { folders[count]->parent = NULL; folders[count]->length = length; @@ -201,7 +146,7 @@ static struct locale_folder *search_folder(struct locale_container *container, c return f; if (c >= 0) high = mid; - else + else low = mid + 1; } return NULL; @@ -212,9 +157,9 @@ static struct locale_folder *search_folder(struct locale_container *container, c */ static int init_container(struct locale_container *container, int dirfd) { - int rc, sfd; + int rc = 0, sfd; DIR *dir; - struct dirent dent, *e; + struct dirent *dent; struct stat st; size_t i, j; struct locale_folder *f; @@ -239,23 +184,22 @@ static int init_container(struct locale_container *container, int dirfd) /* 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))) { + rc = fstatat(sfd, dent->d_name, &st, 0); + if (rc == 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; @@ -265,7 +209,8 @@ static int init_container(struct locale_container *container, int dirfd) } /* sort the folders */ - qsort(container->folders, container->count, sizeof *container->folders, compare_folders_for_qsort); + if (container->count) + qsort(container->folders, container->count, sizeof *container->folders, compare_folders_for_qsort); /* build the parents links */ i = container->count; @@ -333,7 +278,7 @@ struct locale_root *locale_root_create_at(int dirfd, const char *path) */ struct locale_root *locale_root_addref(struct locale_root *root) { - root->refcount++; + __atomic_add_fetch(&root->refcount, 1, __ATOMIC_RELAXED); return root; } @@ -343,7 +288,7 @@ struct locale_root *locale_root_addref(struct locale_root *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); @@ -358,7 +303,7 @@ void locale_root_unref(struct locale_root *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]); @@ -417,12 +362,12 @@ static struct locale_search *create_search(struct locale_root *root, const char struct locale_search_node *node; /* allocate the structure */ - search = malloc(sizeof *search + length); + search = malloc(sizeof *search + 1 + length); if (search == NULL) { errno = ENOMEM; } else { /* init */ - root->intcount++; + __atomic_add_fetch(&root->intcount, 1, __ATOMIC_RELAXED); search->root = root; search->head = NULL; search->refcount = 1; @@ -543,7 +488,7 @@ struct locale_search *locale_root_search(struct locale_root *root, const char *d */ struct locale_search *locale_search_addref(struct locale_search *search) { - search->refcount++; + __atomic_add_fetch(&search->refcount, 1, __ATOMIC_RELAXED); return search; } @@ -554,7 +499,7 @@ void locale_search_unref(struct locale_search *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; @@ -596,7 +541,7 @@ static int do_open(struct locale_search *search, const char *filename, int flags int rootfd, fd; /* check the path and normalize it */ - filename = normalsubpath(filename); + filename = subpath_force(filename); if (filename == NULL) goto inval; @@ -687,7 +632,7 @@ static char *do_resolve(struct locale_search *search, const char *filename, stru int rootfd; /* check the path and normalize it */ - filename = normalsubpath(filename); + filename = subpath_force(filename); if (filename == NULL) goto inval; @@ -769,30 +714,6 @@ char *locale_search_resolve(struct locale_search *search, const char *filename) return do_resolve(search, filename, search->root); } -#if defined(TEST_locale_root_validsubpath) -#include -void t(const char *subpath, int validity) { - printf("%s -> %d = %d, %s\n", subpath, validity, validsubpath(subpath), validsubpath(subpath)==validity ? "ok" : "NOT OK"); -} -int main() { - t("/",0); - t("..",0); - t(".",1); - t("../a",0); - t("a/..",1); - t("a/../////..",0); - t("a/../b/..",1); - t("a/b/c/..",1); - t("a/b/c/../..",1); - t("a/b/c/../../..",1); - t("a/b/c/../../../.",1); - t("./..a/././..b/..c/./.././.././../.",1); - t("./..a/././..b/..c/./.././.././.././..",0); - t("./..a//.//./..b/..c/./.././/./././///.././.././a/a/a/a/a",1); - return 0; -} -#endif - #if defined(TEST_locale_root) int main(int ac,char**av) {