-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+/* Copyright (C) 1995-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 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 as published
+ by the Free Software Foundation; version 2 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
-Library General Public License for more details.
+ 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 General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. 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, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <alloca.h>
#include <langinfo.h>
+#include <sys/types.h>
+#include <regex.h>
#include <string.h>
+#include <stdint.h>
#include <sys/uio.h>
-#ifdef HAVE_REGEX
-# include <regex.h>
-#else
-# include <rx.h>
-#endif
-
-/* Undefine following line in production version. */
-/* #define NDEBUG 1 */
#include <assert.h>
-#include "locales.h"
-#include "stringtrans.h"
+#include "localedef.h"
+#include "linereader.h"
#include "localeinfo.h"
-
-
-void *xmalloc (size_t __n);
+#include "locfile.h"
/* The real definition of the struct for the LC_MESSAGES locale. */
};
-void
+static void
messages_startup (struct linereader *lr, struct localedef_t *locale,
- struct charset_t *charset)
+ int ignore_content)
{
- struct locale_messages_t *messages;
-
- /* It is important that we always use UCS1 encoding for strings now. */
- encoding_method = ENC_UCS1;
+ if (!ignore_content)
+ locale->categories[LC_MESSAGES].messages =
+ (struct locale_messages_t *) xcalloc (1,
+ sizeof (struct locale_messages_t));
- locale->categories[LC_MESSAGES].messages = messages =
- (struct locale_messages_t *) xmalloc (sizeof (struct locale_messages_t));
-
- memset (messages, '\0', sizeof (struct locale_messages_t));
+ if (lr != NULL)
+ {
+ lr->translate_strings = 1;
+ lr->return_widestr = 0;
+ }
}
void
-messages_finish (struct localedef_t *locale)
+messages_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_messages_t *messages
= locale->categories[LC_MESSAGES].messages;
+ int nothing = 0;
+
+ /* Now resolve copying and also handle completely missing definitions. */
+ if (messages == NULL)
+ {
+ /* First see whether we were supposed to copy. If yes, find the
+ actual definition. */
+ if (locale->copy_name[LC_MESSAGES] != 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_MESSAGES, from->copy_name[LC_MESSAGES],
+ from->repertoire_name, charmap);
+ while (from->categories[LC_MESSAGES].messages == NULL
+ && from->copy_name[LC_MESSAGES] != NULL);
+
+ messages = locale->categories[LC_MESSAGES].messages
+ = from->categories[LC_MESSAGES].messages;
+ }
+
+ /* If there is still no definition issue an warning and create an
+ empty one. */
+ if (messages == NULL)
+ {
+ record_warning (_("\
+No definition for %s category found"), "LC_MESSAGES");
+ messages_startup (NULL, locale, 0);
+ messages = locale->categories[LC_MESSAGES].messages;
+ nothing = 1;
+ }
+ }
/* The fields YESSTR and NOSTR are optional. */
+ if (messages->yesstr == NULL)
+ messages->yesstr = "";
+ if (messages->nostr == NULL)
+ messages->nostr = "";
+
if (messages->yesexpr == NULL)
- error (0, 0, _("field `%s' in category `%s' undefined"),
- "yesexpr", "LC_MESSAGES");
+ {
+ if (! nothing)
+ record_error (0, 0, _("%s: field `%s' undefined"),
+ "LC_MESSAGES", "yesexpr");
+ messages->yesexpr = "^[yY]";
+ }
+ else if (messages->yesexpr[0] == '\0')
+ {
+ record_error (0, 0, _("\
+%s: value for field `%s' must not be an empty string"),
+ "LC_MESSAGES", "yesexpr");
+ }
else
{
int result;
/* Test whether it are correct regular expressions. */
result = regcomp (&re, messages->yesexpr, REG_EXTENDED);
- if (result != 0)
+ if (result != 0 && !be_quiet)
{
char errbuf[BUFSIZ];
(void) regerror (result, &re, errbuf, BUFSIZ);
- error (0, 0, _("\
-no correct regular expression for field `%s' in category `%s': %s"),
- "yesexpr", "LC_MESSAGES", errbuf);
+ record_error (0, 0, _("\
+%s: no correct regular expression for field `%s': %s"),
+ "LC_MESSAGES", "yesexpr", errbuf);
}
+ else if (result != 0)
+ regfree (&re);
}
if (messages->noexpr == NULL)
- error (0, 0, _("field `%s' in category `%s' undefined"),
- "noexpr", "LC_MESSAGES");
+ {
+ if (! nothing)
+ record_error (0, 0, _("%s: field `%s' undefined"),
+ "LC_MESSAGES", "noexpr");
+ messages->noexpr = "^[nN]";
+ }
+ else if (messages->noexpr[0] == '\0')
+ {
+ record_error (0, 0, _("\
+%s: value for field `%s' must not be an empty string"),
+ "LC_MESSAGES", "noexpr");
+ }
else
{
int result;
/* Test whether it are correct regular expressions. */
result = regcomp (&re, messages->noexpr, REG_EXTENDED);
- if (result != 0)
+ if (result != 0 && !be_quiet)
{
char errbuf[BUFSIZ];
(void) regerror (result, &re, errbuf, BUFSIZ);
- error (0, 0, _("\
-no correct regular expression for field `%s' in category `%s': %s"),
- "noexpr", "LC_MESSAGES", errbuf);
+ record_error (0, 0, _("\
+%s: no correct regular expression for field `%s': %s"),
+ "LC_MESSAGES", "noexpr", errbuf);
}
+ else if (result != 0)
+ regfree (&re);
}
}
void
-messages_output (struct localedef_t *locale, const char *output_path)
+messages_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ const char *output_path)
{
struct locale_messages_t *messages
= locale->categories[LC_MESSAGES].messages;
- struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES)];
- struct locale_file data;
- u32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES)];
- size_t cnt = 0;
-
- if ((locale->binary & (1 << LC_MESSAGES)) != 0)
- {
- iov[0].iov_base = messages;
- iov[0].iov_len = locale->len[LC_MESSAGES];
-
- write_locale_data (output_path, "LC_MESSAGES", 1, iov);
-
- return;
- }
-
- data.magic = LIMAGIC (LC_MESSAGES);
- data.n = _NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES);
- 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;
+ struct locale_file file;
+
+ init_locale_data (&file, _NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES));
+ add_locale_string (&file, messages->yesexpr);
+ add_locale_string (&file, messages->noexpr);
+ add_locale_string (&file, messages->yesstr);
+ add_locale_string (&file, messages->nostr);
+ add_locale_string (&file, charmap->code_set_name);
+ write_locale_data (output_path, LC_MESSAGES, "LC_MESSAGES", &file);
+}
- idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
- iov[cnt].iov_base = (void *) (messages->yesexpr ?: "");
- 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 *) (messages->noexpr ?: "");
- iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
- ++cnt;
+/* The parser for the LC_MESSAGES section of the locale definition. */
+void
+messages_read (struct linereader *ldfile, struct localedef_t *result,
+ const struct charmap_t *charmap, const char *repertoire_name,
+ int ignore_content)
+{
+ struct repertoire_t *repertoire = NULL;
+ struct locale_messages_t *messages;
+ struct token *now;
+ enum token_t nowtok;
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) (messages->yesstr ?: "");
- iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
- ++cnt;
+ /* Get the repertoire we have to use. */
+ if (repertoire_name != NULL)
+ repertoire = repertoire_read (repertoire_name);
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
- iov[cnt].iov_base = (void *) (messages->nostr ?: "");
- iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
+ /* The rest of the line containing `LC_MESSAGES' must be free. */
+ lr_ignore_rest (ldfile, 1);
- assert (cnt + 1 == 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES));
- write_locale_data (output_path, "LC_MESSAGES",
- 2 + _NL_ITEM_INDEX (_NL_NUM_LC_MESSAGES), iov);
-}
+ 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_messages,
+ LC_MESSAGES, "LC_MESSAGES", ignore_content);
+ return;
+ }
-void
-messages_add (struct linereader *lr, struct localedef_t *locale,
- enum token_t tok, struct token *code,
- struct charset_t *charset)
-{
- struct locale_messages_t *messages
- = locale->categories[LC_MESSAGES].messages;
+ /* Prepare the data structures. */
+ messages_startup (ldfile, result, ignore_content);
+ messages = result->categories[LC_MESSAGES].messages;
- switch (tok)
+ while (1)
{
- case tok_yesexpr:
- if (code->val.str.start == NULL)
- {
- lr_error (lr, _("unknown character in field `%s' of category `%s'"),
- "yesexpr", "LC_MESSAGES");
- messages->yesexpr = "";
- }
- else
- messages->yesexpr = code->val.str.start;
- break;
+ struct token *arg;
- case tok_noexpr:
- if (code->val.str.start == NULL)
- {
- lr_error (lr, _("unknown character in field `%s' of category `%s'"),
- "noexpr", "LC_MESSAGES");
- messages->noexpr = "";
- }
- else
- messages->noexpr = code->val.str.start;
- break;
+ /* Of course we don't proceed beyond the end of file. */
+ if (nowtok == tok_eof)
+ break;
- case tok_yesstr:
- if (code->val.str.start == NULL)
+ /* Ignore empty lines. */
+ if (nowtok == tok_eol)
{
- lr_error (lr, _("unknown character in field `%s' of category `%s'"),
- "yesstr", "LC_MESSAGES");
- messages->yesstr = "";
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
+ nowtok = now->tok;
+ continue;
}
- else
- messages->yesstr = code->val.str.start;
- break;
- case tok_nostr:
- if (code->val.str.start == NULL)
+ switch (nowtok)
{
- lr_error (lr, _("unknown character in field `%s' of category `%s'"),
- "nostr", "LC_MESSAGES");
- messages->nostr = "";
+#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; \
+ } \
+ \
+ if (messages->cat != NULL) \
+ { \
+ lr_error (ldfile, _("\
+%s: field `%s' declared more than once"), "LC_MESSAGES", #cat); \
+ lr_ignore_rest (ldfile, 0); \
+ break; \
+ } \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
+ if (now->tok != tok_string) \
+ goto syntax_error; \
+ else if (!ignore_content && now->val.str.startmb == NULL) \
+ { \
+ lr_error (ldfile, _("\
+%s: unknown character in field `%s'"), "LC_MESSAGES", #cat); \
+ messages->cat = ""; \
+ } \
+ else if (!ignore_content) \
+ messages->cat = now->val.str.startmb; \
+ break
+
+ STR_ELEM (yesexpr);
+ STR_ELEM (noexpr);
+ STR_ELEM (yesstr);
+ STR_ELEM (nostr);
+
+ case tok_end:
+ /* Next we assume `LC_MESSAGES'. */
+ 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_MESSAGES");
+ else if (arg->tok != tok_lc_messages)
+ lr_error (ldfile, _("\
+%1$s: definition does not end with `END %1$s'"), "LC_MESSAGES");
+ lr_ignore_rest (ldfile, arg->tok == tok_lc_messages);
+ return;
+
+ default:
+ syntax_error:
+ SYNTAX_ERROR (_("%s: syntax error"), "LC_MESSAGES");
}
- else
- messages->nostr = code->val.str.start;
- break;
- default:
- assert (! "unknown token in category `LC_MESSAGES': should not happen");
+ /* 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_MESSAGES");
}
projects / thirdparty / glibc.git / blobdiff