summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gettext-tools/src/msgfmt.c14
-rw-r--r--gettext-tools/src/search-path.c153
-rw-r--r--gettext-tools/src/search-path.h6
-rw-r--r--gettext-tools/src/xgettext.c13
4 files changed, 91 insertions, 95 deletions
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index ff4084b..58ca9c1 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -673,19 +673,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\
its_dirs = get_search_path ("its");
its_locating_rules = locating_rule_list_alloc ();
for (dirs = its_dirs; *dirs != NULL; dirs++)
- {
- /* Make it possible to override the locator file location. This
- is necessary for running the testsuite before "make
- install". */
- char *relocated = relocate (*dirs);
- if (relocated != *dirs)
- {
- free (*dirs);
- *dirs = relocated;
- }
-
- locating_rule_list_add_from_directory (its_locating_rules, *dirs);
- }
+ locating_rule_list_add_from_directory (its_locating_rules, *dirs);
its_basename = locating_rule_list_locate (its_locating_rules,
xml_template_name,
diff --git a/gettext-tools/src/search-path.c b/gettext-tools/src/search-path.c
index fdb61cb..c085ec0 100644
--- a/gettext-tools/src/search-path.c
+++ b/gettext-tools/src/search-path.c
@@ -27,100 +27,119 @@
#include <string.h>
#include "concat-filename.h"
+#include "relocatable.h"
#include "xalloc.h"
#include "xmemdup0.h"
#include "xvasprintf.h"
-/* Find the standard search path for data files. Returns a NULL
- terminated list of strings. */
-char **
-get_search_path (const char *name)
-{
- char **result;
- const char *gettextdatadir;
- const char *gettextdatadirs;
- char *base, *dir;
- size_t n_dirs = 2;
+typedef void (* foreach_function_ty) (const char *dir, size_t len, void *data);
- gettextdatadirs = getenv ("GETTEXTDATADIRS");
+struct path_array_ty {
+ char **ptr;
+ size_t len;
+ const char *sub;
+};
- /* If GETTEXTDATADIRS is not set, fallback to XDG_DATA_DIRS. */
- if (gettextdatadirs == NULL || *gettextdatadirs == '\0')
- gettextdatadirs = getenv ("XDG_DATA_DIRS");
+static void
+foreach_components (const char *dirs, foreach_function_ty function, void *data)
+{
+ const char *start = dirs;
- if (gettextdatadirs != NULL)
+ /* Count the number of valid components in GETTEXTDATADIRS. */
+ while (*start != '\0')
{
- const char *start = gettextdatadirs;
+ char *end = strchrnul (start, ':');
- /* Count the number of valid elements in GETTEXTDATADIRS. */
- while (*start != '\0')
- {
- char *end = strchrnul (start, ':');
+ /* Skip empty component. */
+ if (start != end)
+ function (start, end - start, data);
- /* Skip empty element. */
- if (start != end)
- n_dirs++;
+ if (*end == '\0')
+ break;
- if (*end == '\0')
- break;
+ start = end + 1;
+ }
+}
- start = end + 1;
- }
+static void
+increment (const char *dir, size_t len, void *data)
+{
+ size_t *count = data;
+ (*count)++;
+}
+
+static void
+fill (const char *dir, size_t len, void *data)
+{
+ struct path_array_ty *array = data;
+ char *base, *name;
+
+ base = xmemdup0 (dir, len);
+ if (array->sub == NULL)
+ name = base;
+ else
+ {
+ name = xconcatenated_filename (base, array->sub, NULL);
+ free (base);
}
- result = XCALLOC (n_dirs + 1, char *);
+ array->ptr[array->len++] = name;
+}
+
+/* Find the standard search path for data files. Returns a NULL
+ terminated list of strings. */
+char **
+get_search_path (const char *sub)
+{
+ const char *gettextdatadir;
+ const char *gettextdatadirs;
+ struct path_array_ty array;
+ char *base, *name;
+ size_t count = 2;
+
+ gettextdatadirs = getenv ("GETTEXTDATADIRS");
+ if (gettextdatadirs != NULL)
+ foreach_components (gettextdatadirs, increment, &count);
- n_dirs = 0;
+ gettextdatadirs = getenv ("XDG_DATA_DIRS");
+ if (gettextdatadirs != NULL)
+ foreach_components (gettextdatadirs, increment, &count);
+
+ array.ptr = XCALLOC (count + 1, char *);
+ array.len = 0;
+ array.sub = sub;
gettextdatadir = getenv ("GETTEXTDATADIR");
if (gettextdatadir == NULL || gettextdatadir[0] == '\0')
- gettextdatadir = GETTEXTDATADIR;
+ /* Make it possible to override the locator file location. This
+ is necessary for running the testsuite before "make
+ install". */
+ gettextdatadir = relocate (GETTEXTDATADIR);
- if (name == NULL)
- dir = xstrdup (gettextdatadir);
+ if (sub == NULL)
+ name = xstrdup (gettextdatadir);
else
- dir = xconcatenated_filename (gettextdatadir, name, NULL);
- result[n_dirs++] = dir;
+ name = xconcatenated_filename (gettextdatadir, sub, NULL);
+ array.ptr[array.len++] = name;
+ gettextdatadirs = getenv ("GETTEXTDATADIRS");
if (gettextdatadirs != NULL)
- {
- const char *start = gettextdatadirs;
-
- /* Count the number of valid elements in GETTEXTDATADIRS. */
- while (*start != '\0')
- {
- char *end = strchrnul (start, ':');
-
- /* Skip empty element. */
- if (start != end)
- {
- base = xmemdup0 (start, end - start);
- if (name == NULL)
- dir = base;
- else
- {
- dir = xconcatenated_filename (base, name, NULL);
- free (base);
- }
- result[n_dirs++] = dir;
- }
-
- if (*end == '\0')
- break;
-
- start = end + 1;
- }
- }
+ foreach_components (gettextdatadirs, fill, &array);
+
+ gettextdatadirs = getenv ("XDG_DATA_DIRS");
+ if (gettextdatadirs != NULL)
+ foreach_components (gettextdatadirs, fill, &array);
+ /* Append version specific directory. */
base = xasprintf ("%s%s", gettextdatadir, PACKAGE_SUFFIX);
- if (name == NULL)
- dir = base;
+ if (sub == NULL)
+ name = base;
else
{
- dir = xconcatenated_filename (base, name, NULL);
+ name = xconcatenated_filename (base, sub, NULL);
free (base);
}
- result[n_dirs++] = dir;
+ array.ptr[array.len++] = name;
- return result;
+ return array.ptr;
}
diff --git a/gettext-tools/src/search-path.h b/gettext-tools/src/search-path.h
index fc11d0c..6587d23 100644
--- a/gettext-tools/src/search-path.h
+++ b/gettext-tools/src/search-path.h
@@ -25,9 +25,9 @@ extern "C" {
/* Find the standard search path for data files. Returns a NULL
- terminated list of strings. If NAME is not NULL, append it to each
- directory. Note that it does not resolve relocated pathnames. */
-extern char **get_search_path (const char *name);
+ terminated list of strings. If SUB is not NULL, append it to each
+ directory. */
+extern char **get_search_path (const char *sub);
#ifdef __cplusplus
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index f67ec21..fc86d9c 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -739,18 +739,7 @@ xgettext cannot work without keywords to look for"));
its_dirs = get_search_path ("its");
its_locating_rules = locating_rule_list_alloc ();
for (dirs = its_dirs; *dirs != NULL; dirs++)
- {
- /* Make it possible to override the locator file location. This
- is necessary for running the testsuite before "make
- install". */
- char *relocated = relocate (*dirs);
- if (relocated != *dirs)
- {
- free (*dirs);
- *dirs = relocated;
- }
- locating_rule_list_add_from_directory (its_locating_rules, *dirs);
- }
+ locating_rule_list_add_from_directory (its_locating_rules, *dirs);
}
/* Determine extractor from language. */
generated by cgit v1.1 at 2024-12-22 09:25:13 +0000