-/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2002, 2005 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.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
- The GNU C Library is distributed in the hope that it will be useful,
+ This program 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU 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. */
+ You should have received a copy of the GNU General Public License
+ along with this program; 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>
#include <assert.h>
+#include "localedef.h"
#include "localeinfo.h"
#include "locfile.h"
{
#define DEFINE_LANGUAGE_CODE(Name, Ab, Term, Lib) \
{ #Ab, #Term, #Lib },
+#define DEFINE_LANGUAGE_CODE3(Name, Term, Lib) \
+ { "", #Term, #Lib },
#include "iso-639.def"
};
void
-address_finish (struct localedef_t *locale, struct charmap_t *charmap)
+address_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_address_t *address = locale->categories[LC_ADDRESS].address;
size_t cnt;
if (address == NULL)
{
if (! be_quiet)
- error (0, 0, _("No definition for %s category found"),
- "LC_ADDRESS");
+ WITH_CUR_LOCALE (error (0, 0, _("\
+No definition for %s category found"), "LC_ADDRESS"));
address_startup (NULL, locale, 0);
address = locale->categories[LC_ADDRESS].address;
nothing = 1;
if (address->postal_fmt == NULL)
{
if (! nothing)
- error (0, 0, _("%s: field `%s' not defined"),
- "LC_ADDRESS", "postal_fmt");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "postal_fmt"));
/* Use as the default value the value of the i18n locale. */
address->postal_fmt = "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N";
}
const char *cp = address->postal_fmt;
if (*cp == '\0')
- error (0, 0, _("%s: field `%s' must not be empty"),
- "LC_ADDRESS", "postal_fmt");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
+ "LC_ADDRESS", "postal_fmt"));
else
while (*cp != '\0')
{
++cp;
if (strchr ("afdbshNtreCzTSc%", *cp) == NULL)
{
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: invalid escape `%%%c' sequence in field `%s'"),
- "LC_ADDRESS", *cp, "postal_fmt");
+ "LC_ADDRESS", *cp, "postal_fmt"));
break;
}
}
if (address->cat == NULL) \
{ \
if (verbose && ! nothing) \
- error (0, 0, _("%s: field `%s' not defined"), "LC_ADDRESS", #cat); \
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
+ "LC_ADDRESS", #cat)); \
address->cat = ""; \
}
if (address->lang_term == NULL)
{
if (verbose && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"), "LC_ADDRESS",
- "lang_term");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "lang_term"));
address->lang_term = "";
cnt = sizeof (iso639) / sizeof (iso639[0]);
}
else if (address->lang_term[0] == '\0')
{
if (verbose)
- error (0, 0, _("%s: field `%s' must not be empty"),
- "LC_ADDRESS", "lang_term");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
+ "LC_ADDRESS", "lang_term"));
cnt = sizeof (iso639) / sizeof (iso639[0]);
}
else
if (strcmp (address->lang_term, iso639[cnt].term) == 0)
break;
if (cnt == sizeof (iso639) / sizeof (iso639[0]))
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: terminology language code `%s' not defined"),
- "LC_ADDRESS", address->lang_term);
+ "LC_ADDRESS", address->lang_term));
}
if (address->lang_ab == NULL)
{
- if (verbose && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"), "LC_ADDRESS", "lang_ab");
+ if (iso639[cnt].ab[0] != '\0' && verbose && ! nothing)
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "lang_ab"));
address->lang_ab = "";
}
else if (address->lang_ab[0] == '\0')
{
- if (verbose)
- error (0, 0, _("%s: field `%s' must not be empty"),
- "LC_ADDRESS", "lang_ab");
+ if (iso639[cnt].ab[0] != '\0' && verbose)
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
+ "LC_ADDRESS", "lang_ab"));
+ }
+ else if (iso639[cnt].ab[0] == '\0')
+ {
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be defined"),
+ "LC_ADDRESS", "lang_ab"));
+
+ address->lang_ab = "";
}
else
{
if (strcmp (address->lang_ab, iso639[cnt].ab) == 0)
break;
if (cnt == sizeof (iso639) / sizeof (iso639[0]))
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: language abbreviation `%s' not defined"),
- "LC_ADDRESS", address->lang_ab);
+ "LC_ADDRESS", address->lang_ab));
}
else
- if (strcmp (iso639[cnt].ab, address->lang_ab) != 0)
- error (0, 0, _("\
+ if (strcmp (iso639[cnt].ab, address->lang_ab) != 0
+ && iso639[cnt].ab[0] != '\0')
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: `%s' value does not match `%s' value"),
- "LC_ADDRESS", "lang_ab", "lang_term");
+ "LC_ADDRESS", "lang_ab", "lang_term"));
}
if (address->lang_lib == NULL)
else if (address->lang_lib[0] == '\0')
{
if (verbose)
- error (0, 0, _("%s: field `%s' must not be empty"),
- "LC_ADDRESS", "lang_lib");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
+ "LC_ADDRESS", "lang_lib"));
}
else
{
if (strcmp (address->lang_lib, iso639[cnt].lib) == 0)
break;
if (cnt == sizeof (iso639) / sizeof (iso639[0]))
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: language abbreviation `%s' not defined"),
- "LC_ADDRESS", address->lang_lib);
+ "LC_ADDRESS", address->lang_lib));
}
else
if (strcmp (iso639[cnt].ab, address->lang_ab) != 0)
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: `%s' value does not match `%s' value"), "LC_ADDRESS", "lang_lib",
- helper == 1 ? "lang_term" : "lang_ab");
+ helper == 1 ? "lang_term" : "lang_ab"));
}
if (address->country_num == 0)
{
if (verbose && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"),
- "LC_ADDRESS", "country_num");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "country_num"));
cnt = sizeof (iso3166) / sizeof (iso3166[0]);
}
else
break;
if (cnt == sizeof (iso3166) / sizeof (iso3166[0]))
- error (0, 0, _("\
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: numeric country code `%d' not valid"),
- "LC_ADDRESS", address->country_num);
+ "LC_ADDRESS", address->country_num));
}
if (address->country_ab2 == NULL)
{
if (verbose && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"),
- "LC_ADDRESS", "country_ab2");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "country_ab2"));
address->country_ab2 = " ";
}
else if (cnt != sizeof (iso3166) / sizeof (iso3166[0])
&& strcmp (address->country_ab2, iso3166[cnt].ab2) != 0)
- error (0, 0, _("%s: `%s' value does not match `%s' value"),
- "LC_ADDRESS", "country_ab2", "country_num");
+ WITH_CUR_LOCALE (error (0, 0,
+ _("%s: `%s' value does not match `%s' value"),
+ "LC_ADDRESS", "country_ab2", "country_num"));
if (address->country_ab3 == NULL)
{
if (verbose && ! nothing)
- error (0, 0, _("%s: field `%s' not defined"),
- "LC_ADDRESS", "country_ab3");
+ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"),
+ "LC_ADDRESS", "country_ab3"));
address->country_ab3 = " ";
}
else if (cnt != sizeof (iso3166) / sizeof (iso3166[0])
&& strcmp (address->country_ab3, iso3166[cnt].ab3) != 0)
- error (0, 0, _("%s: `%s' value does not match `%s' value"),
- "LC_ADDRESS", "country_ab3", "country_num");
+ WITH_CUR_LOCALE (error (0, 0, _("\
+%s: `%s' value does not match `%s' value"),
+ "LC_ADDRESS", "country_ab3", "country_num"));
}
void
-address_output (struct localedef_t *locale, struct charmap_t *charmap,
+address_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_address_t *address = locale->categories[LC_ADDRESS].address;
assert (cnt == 3 + _NL_ITEM_INDEX (_NL_NUM_LC_ADDRESS));
- write_locale_data (output_path, "LC_ADDRESS",
+ write_locale_data (output_path, LC_ADDRESS, "LC_ADDRESS",
3 + _NL_ITEM_INDEX (_NL_NUM_LC_ADDRESS), iov);
}
/* The parser for the LC_ADDRESS section of the locale definition. */
void
address_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_address_t *address;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string) \
goto err_label; \
if (address->cat != NULL) \
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string && arg->tok != tok_number) \
goto err_label; \
if (address->cat != NULL) \
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_number) \
goto err_label; \
else if (address->cat != 0) \
case tok_end:
/* Next we assume `LC_ADDRESS'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
projects / platform / upstream / glibc.git / blobdiff