2022-01-01 18:54:23 +00:00
|
|
|
/* Copyright (C) 1998-2022 Free Software Foundation, Inc.
|
1999-08-31 07:04:41 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 00:56:07 +00:00
|
|
|
it under the terms of the GNU General Public License as published
|
|
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1999-08-31 07:04:41 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
1999-08-31 07:04:41 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 05:49:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-08-31 07:04:41 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <langinfo.h>
|
|
|
|
#include <string.h>
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
1999-08-31 07:04:41 +00:00
|
|
|
#include <sys/uio.h>
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
2002-02-05 23:29:24 +00:00
|
|
|
#include "localedef.h"
|
1999-08-31 07:04:41 +00:00
|
|
|
#include "localeinfo.h"
|
|
|
|
#include "locfile.h"
|
|
|
|
|
|
|
|
|
|
|
|
/* The real definition of the struct for the LC_MEASUREMENT locale. */
|
|
|
|
struct locale_measurement_t
|
|
|
|
{
|
|
|
|
unsigned char measurement;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
measurement_startup (struct linereader *lr, struct localedef_t *locale,
|
|
|
|
int ignore_content)
|
|
|
|
{
|
|
|
|
if (!ignore_content)
|
|
|
|
locale->categories[LC_MEASUREMENT].measurement =
|
|
|
|
(struct locale_measurement_t *)
|
|
|
|
xcalloc (1, sizeof (struct locale_measurement_t));
|
|
|
|
|
1999-09-12 08:28:56 +00:00
|
|
|
if (lr != NULL)
|
|
|
|
{
|
|
|
|
lr->translate_strings = 1;
|
|
|
|
lr->return_widestr = 0;
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2001-12-10 01:37:56 +00:00
|
|
|
measurement_finish (struct localedef_t *locale,
|
|
|
|
const struct charmap_t *charmap)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
struct locale_measurement_t *measurement =
|
|
|
|
locale->categories[LC_MEASUREMENT].measurement;
|
1999-09-12 08:28:56 +00:00
|
|
|
int nothing = 0;
|
|
|
|
|
|
|
|
/* Now resolve copying and also handle completely missing definitions. */
|
|
|
|
if (measurement == NULL)
|
|
|
|
{
|
|
|
|
/* First see whether we were supposed to copy. If yes, find the
|
|
|
|
actual definition. */
|
|
|
|
if (locale->copy_name[LC_MEASUREMENT] != 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_MEASUREMENT,
|
|
|
|
from->copy_name[LC_MEASUREMENT],
|
|
|
|
from->repertoire_name, charmap);
|
|
|
|
while (from->categories[LC_MEASUREMENT].measurement == NULL
|
|
|
|
&& from->copy_name[LC_MEASUREMENT] != NULL);
|
|
|
|
|
|
|
|
measurement = locale->categories[LC_MEASUREMENT].measurement
|
|
|
|
= from->categories[LC_MEASUREMENT].measurement;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there is still no definition issue an warning and create an
|
|
|
|
empty one. */
|
|
|
|
if (measurement == NULL)
|
|
|
|
{
|
locale: Fix localedef exit code (Bug 22292)
The error and warning handling in localedef, locale, and iconv
is a bit of a mess.
We use ugly constructs like this:
WITH_CUR_LOCALE (error (1, errno, gettext ("\
cannot read character map directory `%s'"), directory));
to issue errors, and read error_message_count directly from the
error API to detect errors. The problem with that is that the
code also uses error to print warnings, and informative messages.
All of this leads to problems where just having warnings will
produce an exit status as-if errors had been seen.
To fix this situation I have adopted the following high-level
changes:
* All errors are counted distinctly.
* All warnings are counted distinctly.
* All informative messages are not counted.
* Increasing verbosity cannot generate *more* errors, and
it previously did for errors conditional on verbose,
this is now fixed.
* Increasing verbosity *can* generate *more* warnings.
* Making the output quiet cannot generate *fewer* errors,
and it previously did for errors conditional on be_quiet,
this is now fixed.
* Each of error, warning, and informative message has it's
own function to call defined in record-status.h, and they
are: record_error, record_warning, and record_verbose.
* The record_error function always records an error, but
conditional on be_quiet may not print it.
* The record_warning function always records a warning,
but conditional on be_quiet may not print it.
* The record_verbose function only prints the verbose
message if verbose is true and be_quiet is false.
This has allowed the following fix:
* Previously any warnings were being treated as errors
because they incremented error_message_count, but now
we properly return an exit status of 1 if there are
warnings but output was generated.
All of this allows localedef to correctly decide if errors,
or warnings were present, and produce the correct exit code.
The locale and iconv programs now also use record-status.h
and we have removed the WITH_CUR_LOCALE hack, and instead
have internal push_locale/pop_locale functions centralized
in the record routines.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-10-13 16:54:03 +00:00
|
|
|
record_warning (_("\
|
|
|
|
No definition for %s category found"), "LC_MEASUREMENT");
|
1999-09-12 08:28:56 +00:00
|
|
|
measurement_startup (NULL, locale, 0);
|
|
|
|
measurement = locale->categories[LC_MEASUREMENT].measurement;
|
|
|
|
nothing = 1;
|
|
|
|
}
|
|
|
|
}
|
1999-08-31 07:04:41 +00:00
|
|
|
|
|
|
|
if (measurement->measurement == 0)
|
|
|
|
{
|
1999-09-12 08:28:56 +00:00
|
|
|
if (! nothing)
|
locale: Fix localedef exit code (Bug 22292)
The error and warning handling in localedef, locale, and iconv
is a bit of a mess.
We use ugly constructs like this:
WITH_CUR_LOCALE (error (1, errno, gettext ("\
cannot read character map directory `%s'"), directory));
to issue errors, and read error_message_count directly from the
error API to detect errors. The problem with that is that the
code also uses error to print warnings, and informative messages.
All of this leads to problems where just having warnings will
produce an exit status as-if errors had been seen.
To fix this situation I have adopted the following high-level
changes:
* All errors are counted distinctly.
* All warnings are counted distinctly.
* All informative messages are not counted.
* Increasing verbosity cannot generate *more* errors, and
it previously did for errors conditional on verbose,
this is now fixed.
* Increasing verbosity *can* generate *more* warnings.
* Making the output quiet cannot generate *fewer* errors,
and it previously did for errors conditional on be_quiet,
this is now fixed.
* Each of error, warning, and informative message has it's
own function to call defined in record-status.h, and they
are: record_error, record_warning, and record_verbose.
* The record_error function always records an error, but
conditional on be_quiet may not print it.
* The record_warning function always records a warning,
but conditional on be_quiet may not print it.
* The record_verbose function only prints the verbose
message if verbose is true and be_quiet is false.
This has allowed the following fix:
* Previously any warnings were being treated as errors
because they incremented error_message_count, but now
we properly return an exit status of 1 if there are
warnings but output was generated.
All of this allows localedef to correctly decide if errors,
or warnings were present, and produce the correct exit code.
The locale and iconv programs now also use record-status.h
and we have removed the WITH_CUR_LOCALE hack, and instead
have internal push_locale/pop_locale functions centralized
in the record routines.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-10-13 16:54:03 +00:00
|
|
|
record_error (0, 0, _("%s: field `%s' not defined"),
|
|
|
|
"LC_MEASUREMENT", "measurement");
|
1999-08-31 07:04:41 +00:00
|
|
|
/* Use as the default value the value of the i18n locale. */
|
|
|
|
measurement->measurement = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (measurement->measurement > 3)
|
locale: Fix localedef exit code (Bug 22292)
The error and warning handling in localedef, locale, and iconv
is a bit of a mess.
We use ugly constructs like this:
WITH_CUR_LOCALE (error (1, errno, gettext ("\
cannot read character map directory `%s'"), directory));
to issue errors, and read error_message_count directly from the
error API to detect errors. The problem with that is that the
code also uses error to print warnings, and informative messages.
All of this leads to problems where just having warnings will
produce an exit status as-if errors had been seen.
To fix this situation I have adopted the following high-level
changes:
* All errors are counted distinctly.
* All warnings are counted distinctly.
* All informative messages are not counted.
* Increasing verbosity cannot generate *more* errors, and
it previously did for errors conditional on verbose,
this is now fixed.
* Increasing verbosity *can* generate *more* warnings.
* Making the output quiet cannot generate *fewer* errors,
and it previously did for errors conditional on be_quiet,
this is now fixed.
* Each of error, warning, and informative message has it's
own function to call defined in record-status.h, and they
are: record_error, record_warning, and record_verbose.
* The record_error function always records an error, but
conditional on be_quiet may not print it.
* The record_warning function always records a warning,
but conditional on be_quiet may not print it.
* The record_verbose function only prints the verbose
message if verbose is true and be_quiet is false.
This has allowed the following fix:
* Previously any warnings were being treated as errors
because they incremented error_message_count, but now
we properly return an exit status of 1 if there are
warnings but output was generated.
All of this allows localedef to correctly decide if errors,
or warnings were present, and produce the correct exit code.
The locale and iconv programs now also use record-status.h
and we have removed the WITH_CUR_LOCALE hack, and instead
have internal push_locale/pop_locale functions centralized
in the record routines.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-10-13 16:54:03 +00:00
|
|
|
record_error (0, 0, _("%s: invalid value for field `%s'"),
|
|
|
|
"LC_MEASUREMENT", "measurement");
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2001-12-10 01:37:56 +00:00
|
|
|
measurement_output (struct localedef_t *locale,
|
|
|
|
const struct charmap_t *charmap, const char *output_path)
|
1999-08-31 07:04:41 +00:00
|
|
|
{
|
|
|
|
struct locale_measurement_t *measurement =
|
|
|
|
locale->categories[LC_MEASUREMENT].measurement;
|
2013-09-06 17:20:45 +00:00
|
|
|
struct locale_file file;
|
|
|
|
|
|
|
|
init_locale_data (&file, _NL_ITEM_INDEX (_NL_NUM_LC_MEASUREMENT));
|
|
|
|
add_locale_char (&file, measurement->measurement);
|
|
|
|
add_locale_string (&file, charmap->code_set_name);
|
|
|
|
write_locale_data (output_path, LC_MEASUREMENT, "LC_MEASUREMENT", &file);
|
1999-08-31 07:04:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* The parser for the LC_MEASUREMENT section of the locale definition. */
|
|
|
|
void
|
|
|
|
measurement_read (struct linereader *ldfile, struct localedef_t *result,
|
2001-12-10 01:37:56 +00:00
|
|
|
const struct charmap_t *charmap, const char *repertoire_name,
|
1999-08-31 07:04:41 +00:00
|
|
|
int ignore_content)
|
|
|
|
{
|
|
|
|
struct locale_measurement_t *measurement;
|
|
|
|
struct token *now;
|
|
|
|
struct token *arg;
|
|
|
|
enum token_t nowtok;
|
|
|
|
|
|
|
|
/* The rest of the line containing `LC_MEASUREMENT' must be free. */
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
}
|
|
|
|
while (nowtok == tok_eol);
|
|
|
|
|
|
|
|
/* If we see `copy' now we are almost done. */
|
|
|
|
if (nowtok == tok_copy)
|
|
|
|
{
|
2000-01-17 01:57:24 +00:00
|
|
|
handle_copy (ldfile, charmap, repertoire_name, result,
|
|
|
|
tok_lc_measurement, LC_MEASUREMENT, "LC_MEASUREMENT",
|
|
|
|
ignore_content);
|
1999-08-31 07:04:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare the data structures. */
|
|
|
|
measurement_startup (ldfile, result, ignore_content);
|
|
|
|
measurement = result->categories[LC_MEASUREMENT].measurement;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
/* Of course we don't proceed beyond the end of file. */
|
|
|
|
if (nowtok == tok_eof)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Ingore empty lines. */
|
|
|
|
if (nowtok == tok_eol)
|
|
|
|
{
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (nowtok)
|
|
|
|
{
|
|
|
|
#define INT_ELEM(cat) \
|
|
|
|
case tok_##cat: \
|
1999-09-12 08:28:56 +00:00
|
|
|
/* 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; \
|
|
|
|
} \
|
|
|
|
\
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose); \
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok != tok_number) \
|
|
|
|
goto err_label; \
|
|
|
|
else if (measurement->cat != 0) \
|
|
|
|
lr_error (ldfile, _("%s: field `%s' declared more than once"), \
|
|
|
|
"LC_MEASUREMENT", #cat); \
|
|
|
|
else if (!ignore_content) \
|
|
|
|
measurement->cat = arg->val.num; \
|
|
|
|
break
|
|
|
|
|
|
|
|
INT_ELEM (measurement);
|
|
|
|
|
|
|
|
case tok_end:
|
|
|
|
/* Next we assume `LC_MEASUREMENT'. */
|
2001-12-10 01:37:56 +00:00
|
|
|
arg = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
if (arg->tok == tok_eof)
|
|
|
|
break;
|
|
|
|
if (arg->tok == tok_eol)
|
|
|
|
lr_error (ldfile, _("%s: incomplete `END' line"),
|
|
|
|
"LC_MEASUREMENT");
|
|
|
|
else if (arg->tok != tok_lc_measurement)
|
|
|
|
lr_error (ldfile, _("\
|
|
|
|
%1$s: definition does not end with `END %1$s'"), "LC_MEASUREMENT");
|
|
|
|
lr_ignore_rest (ldfile, arg->tok == tok_lc_measurement);
|
|
|
|
return;
|
|
|
|
|
|
|
|
default:
|
|
|
|
err_label:
|
|
|
|
SYNTAX_ERROR (_("%s: syntax error"), "LC_MEASUREMENT");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare for the next round. */
|
2001-12-10 01:37:56 +00:00
|
|
|
now = lr_token (ldfile, charmap, result, NULL, verbose);
|
1999-08-31 07:04:41 +00:00
|
|
|
nowtok = now->tok;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When we come here we reached the end of the file. */
|
|
|
|
lr_error (ldfile, _("%s: premature end of file"),
|
|
|
|
"LC_MEASUREMENT");
|
|
|
|
}
|