mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
a7b65cdc9a
2002-04-18 Ulrich Drepper <drepper@redhat.com> * locale/programs/locfile.c (to_archive): New variable. To collect data which has to be added to the locale archive. (write_all_categories): Take new third parameter with locale name. Unless no_archive flag set add new locale data to the archive (write_locale_data): Unless no-archive flag set store generated data in to_archive data structure instead of generation output file. Add new parameter with locale category index. * locale/programs/locfile.h: Add new parameters in declaractions of write_all_categories and write_locale_data. * locale/programs/localedef.c: Recognize --no-archive, --list-archive, --add-to-archive, and --delete-from-archive options. Pass extra parameter to write_all_categories. * locale/programs/localedef.h: Add prototypes for functions in locarchive.c. * locale/locarchive.h: New file. * locale/programs/locarchive.c: New file. * locale/Makefile (distribute): Add programs/locarchive.c and locarchive.h. (localedef-modules): Add md5 and locarchive. Add vpath to crypt subdir for md5.c. * locale/programs/ld-address.c: Pass locale category ID as new second parameter to write_locale_data. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-identification.c: Likewise. * locale/programs/ld-measurement.c: Likewise. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-name.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-paper.c: Likewise. * locale/programs/ld-telephone.c: Likewise. * locale/programs/ld-time.c: Likewise. * locale/simple-hash.c: Move compute_hashval function from here... * locale/hashval.h: ...to here. New file. * locale/simple-hash.h: Add prototype for compute_hashval. * include/libintl.h: Minor cleanups. * elf/reldep7.c: New file. * elf/reldep7mod1.c: New file. * elf/reldep7mod2.c: New file. * elf/Makefile: Add rules to build and run reldep7.
326 lines
9.0 KiB
C
326 lines
9.0 KiB
C
/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <langinfo.h>
|
|
#include <string.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include "localedef.h"
|
|
#include "localeinfo.h"
|
|
#include "locfile.h"
|
|
|
|
|
|
/* The real definition of the struct for the LC_NAME locale. */
|
|
struct locale_name_t
|
|
{
|
|
const char *name_fmt;
|
|
const char *name_gen;
|
|
const char *name_mr;
|
|
const char *name_mrs;
|
|
const char *name_miss;
|
|
const char *name_ms;
|
|
};
|
|
|
|
|
|
static void
|
|
name_startup (struct linereader *lr, struct localedef_t *locale,
|
|
int ignore_content)
|
|
{
|
|
if (!ignore_content)
|
|
locale->categories[LC_NAME].name =
|
|
(struct locale_name_t *) xcalloc (1, sizeof (struct locale_name_t));
|
|
|
|
if (lr != NULL)
|
|
{
|
|
lr->translate_strings = 1;
|
|
lr->return_widestr = 0;
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
name_finish (struct localedef_t *locale, const struct charmap_t *charmap)
|
|
{
|
|
struct locale_name_t *name = locale->categories[LC_NAME].name;
|
|
int nothing = 0;
|
|
|
|
/* Now resolve copying and also handle completely missing definitions. */
|
|
if (name == NULL)
|
|
{
|
|
/* First see whether we were supposed to copy. If yes, find the
|
|
actual definition. */
|
|
if (locale->copy_name[LC_NAME] != NULL)
|
|
{
|
|
/* Find the copying locale. This has to happen transitively since
|
|
the locale we are copying from might also copying another one. */
|
|
struct localedef_t *from = locale;
|
|
|
|
do
|
|
from = find_locale (LC_NAME, from->copy_name[LC_NAME],
|
|
from->repertoire_name, charmap);
|
|
while (from->categories[LC_NAME].name == NULL
|
|
&& from->copy_name[LC_NAME] != NULL);
|
|
|
|
name = locale->categories[LC_NAME].name
|
|
= from->categories[LC_NAME].name;
|
|
}
|
|
|
|
/* If there is still no definition issue an warning and create an
|
|
empty one. */
|
|
if (name == NULL)
|
|
{
|
|
if (! be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
No definition for %s category found"), "LC_NAME"));
|
|
name_startup (NULL, locale, 0);
|
|
name = locale->categories[LC_NAME].name;
|
|
nothing = 1;
|
|
}
|
|
}
|
|
|
|
if (name->name_fmt == NULL)
|
|
{
|
|
if (! nothing)
|
|
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
|
|
"LC_NAME", "name_fmt"));
|
|
/* Use as the default value the value of the i18n locale. */
|
|
name->name_fmt = "%p%t%g%t%m%t%f";
|
|
}
|
|
else
|
|
{
|
|
/* We must check whether the format string contains only the
|
|
allowed escape sequences. */
|
|
const char *cp = name->name_fmt;
|
|
|
|
if (*cp == '\0')
|
|
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
|
|
"LC_NAME", "name_fmt"));
|
|
else
|
|
while (*cp != '\0')
|
|
{
|
|
if (*cp == '%')
|
|
{
|
|
if (*++cp == 'R')
|
|
/* Romanize-flag. */
|
|
++cp;
|
|
if (strchr ("dfFgGlomMpsSt", *cp) == NULL)
|
|
{
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: invalid escape sequence in field `%s'"), "LC_NAME", "name_fmt"));
|
|
break;
|
|
}
|
|
}
|
|
++cp;
|
|
}
|
|
}
|
|
|
|
#define TEST_ELEM(cat) \
|
|
if (name->cat == NULL) \
|
|
{ \
|
|
if (verbose && ! nothing) \
|
|
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
|
|
"LC_NAME", #cat)); \
|
|
name->cat = ""; \
|
|
}
|
|
|
|
TEST_ELEM (name_gen);
|
|
TEST_ELEM (name_mr);
|
|
TEST_ELEM (name_mrs);
|
|
TEST_ELEM (name_miss);
|
|
TEST_ELEM (name_ms);
|
|
}
|
|
|
|
|
|
void
|
|
name_output (struct localedef_t *locale, const struct charmap_t *charmap,
|
|
const char *output_path)
|
|
{
|
|
struct locale_name_t *name = locale->categories[LC_NAME].name;
|
|
struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_NAME)];
|
|
struct locale_file data;
|
|
uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_NAME)];
|
|
size_t cnt = 0;
|
|
|
|
data.magic = LIMAGIC (LC_NAME);
|
|
data.n = _NL_ITEM_INDEX (_NL_NUM_LC_NAME);
|
|
iov[cnt].iov_base = (void *) &data;
|
|
iov[cnt].iov_len = sizeof (data);
|
|
++cnt;
|
|
|
|
iov[cnt].iov_base = (void *) idx;
|
|
iov[cnt].iov_len = sizeof (idx);
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_fmt;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_gen;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_mr;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_mrs;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_miss;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) name->name_ms;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
|
|
iov[cnt].iov_base = (void *) charmap->code_set_name;
|
|
iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
|
|
++cnt;
|
|
|
|
assert (cnt == 2 + _NL_ITEM_INDEX (_NL_NUM_LC_NAME));
|
|
|
|
write_locale_data (output_path, LC_NAME, "LC_NAME",
|
|
2 + _NL_ITEM_INDEX (_NL_NUM_LC_NAME), iov);
|
|
}
|
|
|
|
|
|
/* The parser for the LC_NAME section of the locale definition. */
|
|
void
|
|
name_read (struct linereader *ldfile, struct localedef_t *result,
|
|
const struct charmap_t *charmap, const char *repertoire_name,
|
|
int ignore_content)
|
|
{
|
|
struct locale_name_t *name;
|
|
struct token *now;
|
|
struct token *arg;
|
|
enum token_t nowtok;
|
|
|
|
/* The rest of the line containing `LC_NAME' must be empty. */
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
do
|
|
{
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
|
nowtok = now->tok;
|
|
}
|
|
while (nowtok == tok_eol);
|
|
|
|
/* If we see `copy' now we are almost done. */
|
|
if (nowtok == tok_copy)
|
|
{
|
|
handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_name,
|
|
LC_NAME, "LC_NAME", ignore_content);
|
|
return;
|
|
}
|
|
|
|
/* Prepare the data structures. */
|
|
name_startup (ldfile, result, ignore_content);
|
|
name = result->categories[LC_NAME].name;
|
|
|
|
while (1)
|
|
{
|
|
/* Of course we don't proceed beyond the end of file. */
|
|
if (nowtok == tok_eof)
|
|
break;
|
|
|
|
/* Ignore empty lines. */
|
|
if (nowtok == tok_eol)
|
|
{
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
|
nowtok = now->tok;
|
|
continue;
|
|
}
|
|
|
|
switch (nowtok)
|
|
{
|
|
#define STR_ELEM(cat) \
|
|
case tok_##cat: \
|
|
/* Ignore the rest of the line if we don't need the input of \
|
|
this line. */ \
|
|
if (ignore_content) \
|
|
{ \
|
|
lr_ignore_rest (ldfile, 0); \
|
|
break; \
|
|
} \
|
|
\
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose); \
|
|
if (arg->tok != tok_string) \
|
|
goto err_label; \
|
|
if (name->cat != NULL) \
|
|
lr_error (ldfile, _("%s: field `%s' declared more than once"), \
|
|
"LC_NAME", #cat); \
|
|
else if (!ignore_content && arg->val.str.startmb == NULL) \
|
|
{ \
|
|
lr_error (ldfile, _("%s: unknown character in field `%s'"), \
|
|
"LC_NAME", #cat); \
|
|
name->cat = ""; \
|
|
} \
|
|
else if (!ignore_content) \
|
|
name->cat = arg->val.str.startmb; \
|
|
break
|
|
|
|
STR_ELEM (name_fmt);
|
|
STR_ELEM (name_gen);
|
|
STR_ELEM (name_mr);
|
|
STR_ELEM (name_mrs);
|
|
STR_ELEM (name_miss);
|
|
STR_ELEM (name_ms);
|
|
|
|
case tok_end:
|
|
/* Next we assume `LC_NAME'. */
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose);
|
|
if (arg->tok == tok_eof)
|
|
break;
|
|
if (arg->tok == tok_eol)
|
|
lr_error (ldfile, _("%s: incomplete `END' line"), "LC_NAME");
|
|
else if (arg->tok != tok_lc_name)
|
|
lr_error (ldfile, _("\
|
|
%1$s: definition does not end with `END %1$s'"), "LC_NAME");
|
|
lr_ignore_rest (ldfile, arg->tok == tok_lc_name);
|
|
return;
|
|
|
|
default:
|
|
err_label:
|
|
SYNTAX_ERROR (_("%s: syntax error"), "LC_NAME");
|
|
}
|
|
|
|
/* Prepare for the next round. */
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
|
nowtok = now->tok;
|
|
}
|
|
|
|
/* When we come here we reached the end of the file. */
|
|
lr_error (ldfile, _("%s: premature end of file"), "LC_NAME");
|
|
}
|