/* Implementation of the locale program according to POSIX 9945-2.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 1999-2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 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
- Library 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 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, 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 <dirent.h>
#include <errno.h>
#include <error.h>
+#include <fcntl.h>
#include <langinfo.h>
#include <libintl.h>
#include <limits.h>
#include <locale.h>
#include <search.h>
#include <stdio.h>
+#include <stdio_ext.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/mman.h>
#include <sys/stat.h>
#include "localeinfo.h"
+#include "charmap-dir.h"
+#include "../locarchive.h"
+extern void *xmalloc (size_t __n);
+extern char *xstrdup (const char *__str);
+
+#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
/* If set print the name of the category. */
static int show_category_name;
/* Print names of all available character maps. */
static int do_charmaps = 0;
+/* Nonzero if verbose output is wanted. */
+static int verbose;
+
/* Name and version of program. */
static void print_version (FILE *stream, struct argp_state *state);
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
{ NULL, 0, NULL, 0, N_("Modify output format:") },
{ "category-name", 'c', NULL, 0, N_("Write names of selected categories") },
{ "keyword-name", 'k', NULL, 0, N_("Write names of selected keywords") },
+ { "verbose", 'v', NULL, 0, N_("Print more information") },
{ NULL, 0, NULL, 0, NULL }
};
/* Short description of program. */
-static const char doc[] = N_("Get locale-specific information.");
+static const char doc[] = N_("Get locale-specific information.\v\
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n");
/* Strings for arguments in help texts. */
static const char args_doc[] = N_("NAME\n[-a|-m]");
/* Prototype for option handler. */
static error_t parse_opt (int key, char *arg, struct argp_state *state);
-/* Function to print some extra text in the help message. */
-static char *more_help (int key, const char *text, void *input);
-
/* Data structure to communicate with argp functions. */
static struct argp argp =
{
- options, parse_opt, args_doc, doc, NULL, more_help
+ options, parse_opt, args_doc, doc
};
/* We have all categories defined in `categories.def'. Now construct
the description and data structure used for all categories. */
#define DEFINE_ELEMENT(Item, More...) { Item, ## More },
-#define DEFINE_CATEGORY(category, name, items, postload, in, check, out) \
+#define DEFINE_CATEGORY(category, name, items, postload) \
static struct cat_item category##_desc[] = \
{ \
NO_PAREN items \
static struct category category[] =
{
-#define DEFINE_CATEGORY(category, name, items, postload, in, check, out) \
+#define DEFINE_CATEGORY(category, name, items, postload) \
[category] = { _NL_NUM_##category, name, NELEMS (category##_desc), \
category##_desc },
#include "categories.def"
int show_keyword_name);
/* Prototypes for local functions. */
+static void print_LC_IDENTIFICATION (void *mapped, size_t size);
+static void print_LC_CTYPE (void *mapped, size_t size);
static void write_locales (void);
+static int nameentcmp (const void *a, const void *b);
+static int write_archive_locales (void **all_datap, char *linebuf);
static void write_charmaps (void);
static void show_locale_vars (void);
static void show_info (const char *name);
/* Set locale. Do not set LC_ALL because the other categories must
not be affected (according to POSIX.2). */
- setlocale (LC_CTYPE, "");
- setlocale (LC_MESSAGES, "");
+ if (setlocale (LC_CTYPE, "") == NULL)
+ error (0, errno, gettext ("Cannot set LC_CTYPE to default locale"));
+ if (setlocale (LC_MESSAGES, "") == NULL)
+ error (0, errno, gettext ("Cannot set LC_MESSAGES to default locale"));
/* Initialize the message catalog. */
textdomain (PACKAGE);
/* `-a' requests the names of all available locales. */
if (do_all != 0)
{
- setlocale (LC_COLLATE, "");
+ if (setlocale (LC_COLLATE, "") == NULL)
+ error (0, errno,
+ gettext ("Cannot set LC_COLLATE to default locale"));
write_locales ();
exit (EXIT_SUCCESS);
}
/* Specific information about the current locale are requested.
Change to this locale now. */
- setlocale (LC_ALL, "");
+ if (setlocale (LC_ALL, "") == NULL)
+ error (0, errno, gettext ("Cannot set LC_ALL to default locale"));
/* If no real argument is given we have to print the contents of the
current locale definition variables. These are LANG and the LC_*. */
case 'k':
show_keyword_name = 1;
break;
+ case 'v':
+ verbose = 1;
+ break;
default:
return ARGP_ERR_UNKNOWN;
}
}
-static char *
-more_help (int key, const char *text, void *input)
-{
- switch (key)
- {
- case ARGP_KEY_HELP_EXTRA:
- /* We print some extra information. */
- return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.ai.mit.edu>.\n"));
- default:
- break;
- }
- return (char *) text;
-}
-
/* Print the version information. */
static void
print_version (FILE *stream, struct argp_state *state)
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1995, 1996, 1997");
+"), "2005");
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
}
}
+static int
+select_dirs (const struct dirent *dirent)
+{
+ int result = 0;
+
+ if (strcmp (dirent->d_name, ".") != 0 && strcmp (dirent->d_name, "..") != 0)
+ {
+ mode_t mode = 0;
+
+#ifdef _DIRENT_HAVE_D_TYPE
+ if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_LNK)
+ mode = DTTOIF (dirent->d_type);
+ else
+#endif
+ {
+ struct stat64 st;
+ char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1];
+
+ stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name);
+
+ if (stat64 (buf, &st) == 0)
+ mode = st.st_mode;
+ }
+
+ result = S_ISDIR (mode);
+ }
+
+ return result;
+}
+
+
+static void
+print_LC_IDENTIFICATION (void *mapped, size_t size)
+{
+ /* Read the information from the file. */
+ struct
+ {
+ unsigned int magic;
+ unsigned int nstrings;
+ unsigned int strindex[0];
+ } *filedata = mapped;
+
+ if (filedata->magic == LIMAGIC (LC_IDENTIFICATION)
+ && (sizeof *filedata
+ + (filedata->nstrings
+ * sizeof (unsigned int))
+ <= size))
+ {
+ const char *str;
+
+#define HANDLE(idx, name) \
+ str = ((char *) mapped \
+ + filedata->strindex[_NL_ITEM_INDEX (_NL_IDENTIFICATION_##idx)]); \
+ if (*str != '\0') \
+ printf ("%9s | %s\n", name, str)
+ HANDLE (TITLE, "title");
+ HANDLE (SOURCE, "source");
+ HANDLE (ADDRESS, "address");
+ HANDLE (CONTACT, "contact");
+ HANDLE (EMAIL, "email");
+ HANDLE (TEL, "telephone");
+ HANDLE (FAX, "fax");
+ HANDLE (LANGUAGE, "language");
+ HANDLE (TERRITORY, "territory");
+ HANDLE (AUDIENCE, "audience");
+ HANDLE (APPLICATION, "application");
+ HANDLE (ABBREVIATION, "abbreviation");
+ HANDLE (REVISION, "revision");
+ HANDLE (DATE, "date");
+ }
+}
+
+
+static void
+print_LC_CTYPE (void *mapped, size_t size)
+{
+ struct
+ {
+ unsigned int magic;
+ unsigned int nstrings;
+ unsigned int strindex[0];
+ } *filedata = mapped;
+
+ if (filedata->magic == LIMAGIC (LC_CTYPE)
+ && (sizeof *filedata
+ + (filedata->nstrings
+ * sizeof (unsigned int))
+ <= size))
+ {
+ const char *str;
+
+ str = ((char *) mapped
+ + filedata->strindex[_NL_ITEM_INDEX (_NL_CTYPE_CODESET_NAME)]);
+ if (*str != '\0')
+ printf (" codeset | %s\n", str);
+ }
+}
+
+
/* Write the names of all available locales to stdout. We have some
sources of the information: the contents of the locale directory
and the locale.alias file. To avoid duplicates and print the
static void
write_locales (void)
{
+ char linebuf[80];
void *all_data = NULL;
- DIR *dir;
- struct dirent *dirent;
+ struct dirent **dirents;
+ int ndirents;
+ int cnt;
char *alias_path;
size_t alias_path_len;
char *entry;
+ int first_locale = 1;
-#define PUT(name) tsearch ((name), &all_data, \
+#define PUT(name) tsearch (name, &all_data, \
+ (int (*) (const void *, const void *)) strcoll)
+#define GET(name) tfind (name, &all_data, \
(int (*) (const void *, const void *)) strcoll)
-
- dir = opendir (LOCALEDIR);
- if (dir == NULL)
- {
- error (1, errno, gettext ("cannot read locale directory `%s'"),
- LOCALEDIR);
- return;
- }
/* `POSIX' locale is always available (POSIX.2 4.34.3). */
PUT ("POSIX");
/* And so is the "C" locale. */
PUT ("C");
+ memset (linebuf, '-', sizeof (linebuf) - 1);
+ linebuf[sizeof (linebuf) - 1] = '\0';
+
+ /* First scan the locale archive. */
+ if (write_archive_locales (&all_data, linebuf))
+ first_locale = 0;
+
/* Now we can look for all files in the directory. */
- while ((dirent = readdir (dir)) != NULL)
- if (strcmp (dirent->d_name, ".") != 0
- && strcmp (dirent->d_name, "..") != 0)
- {
- mode_t mode;
-#ifdef _DIRENT_HAVE_D_TYPE
- if (dirent->d_type != DT_UNKNOWN)
- mode = DTTOIF (dirent->d_type);
- else
-#endif
- {
- struct stat st;
- char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1];
+ ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort);
+ for (cnt = 0; cnt < ndirents; ++cnt)
+ {
+ /* Test whether at least the LC_CTYPE data is there. Some
+ directories only contain translations. */
+ char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name)
+ + sizeof "/LC_IDENTIFICATION"];
+ char *enddir;
+ struct stat64 st;
+
+ stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"),
+ dirents[cnt]->d_name),
+ "/LC_IDENTIFICATION");
+
+ if (stat64 (buf, &st) == 0 && S_ISREG (st.st_mode))
+ {
+ if (verbose && GET (dirents[cnt]->d_name) == NULL)
+ {
+ /* Provide some nice output of all kinds of
+ information. */
+ int fd;
- stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name);
+ if (! first_locale)
+ putchar_unlocked ('\n');
+ first_locale = 0;
- if (stat (buf, &st) < 0)
- continue;
- mode = st.st_mode;
- }
+ printf ("locale: %-15.15s directory: %.*s\n%s\n",
+ dirents[cnt]->d_name, (int) (enddir - buf), buf,
+ linebuf);
- if (S_ISDIR (mode))
- PUT (strdup (dirent->d_name));
- }
+ fd = open64 (buf, O_RDONLY);
+ if (fd != -1)
+ {
+ void *mapped = mmap64 (NULL, st.st_size, PROT_READ,
+ MAP_SHARED, fd, 0);
+ if (mapped != MAP_FAILED)
+ {
+ print_LC_IDENTIFICATION (mapped, st.st_size);
+
+ munmap (mapped, st.st_size);
+ }
+
+ close (fd);
+
+ /* Now try to get the charset information. */
+ strcpy (enddir, "/LC_CTYPE");
+ fd = open64 (buf, O_RDONLY);
+ if (fd != -1 && fstat64 (fd, &st) >= 0
+ && ((mapped = mmap64 (NULL, st.st_size, PROT_READ,
+ MAP_SHARED, fd, 0))
+ != MAP_FAILED))
+ {
+ print_LC_CTYPE (mapped, st.st_size);
+
+ munmap (mapped, st.st_size);
+ }
- closedir (dir);
+ if (fd != -1)
+ close (fd);
+ }
+ }
+
+ /* If the verbose format is not selected we simply
+ collect the names. */
+ PUT (xstrdup (dirents[cnt]->d_name));
+ }
+ }
+ if (ndirents > 0)
+ free (dirents);
/* Now read the locale.alias files. */
if (argz_create_sep (LOCALE_ALIAS_PATH, ':', &alias_path, &alias_path_len))
char full_name[strlen (entry) + sizeof aliasfile];
stpcpy (stpcpy (full_name, entry), aliasfile);
- fp = fopen (full_name, "r");
+ fp = fopen (full_name, "rm");
if (fp == NULL)
/* Ignore non-existing files. */
continue;
- while (! feof (fp))
+ /* No threads present. */
+ __fsetlocking (fp, FSETLOCKING_BYCALLER);
+
+ while (! feof_unlocked (fp))
{
/* It is a reasonable approach to use a fix buffer here
because
char *value;
char *cp;
- if (fgets (buf, BUFSIZ, fp) == NULL)
+ if (fgets_unlocked (buf, BUFSIZ, fp) == NULL)
/* EOF reached. */
break;
cp = buf;
/* Ignore leading white space. */
- while (isspace (cp[0]))
+ while (isspace (cp[0]) && cp[0] != '\n')
++cp;
/* A leading '#' signals a comment line. */
- if (cp[0] != '\0' && cp[0] != '#')
+ if (cp[0] != '\0' && cp[0] != '#' && cp[0] != '\n')
{
alias = cp++;
while (cp[0] != '\0' && !isspace (cp[0]))
*cp++ = '\0';
/* Add the alias. */
- PUT (strdup (alias));
+ if (! verbose && GET (value) != NULL)
+ PUT (xstrdup (alias));
}
}
while (strchr (cp, '\n') == NULL)
{
cp = buf;
- if (fgets (buf, BUFSIZ, fp) == NULL)
+ if (fgets_unlocked (buf, BUFSIZ, fp) == NULL)
/* Make sure the inner loop will be left. The outer
loop will exit at the `feof' test. */
*cp = '\n';
fclose (fp);
}
- twalk (all_data, print_names);
+ if (! verbose)
+ {
+ twalk (all_data, print_names);
+ }
}
-/* Write the names of all available character maps to stdout. */
-static void
-write_charmaps (void)
+struct nameent
{
- void *all_data = NULL;
- DIR *dir;
- struct dirent *dirent;
+ char *name;
+ uint32_t locrec_offset;
+};
- dir = opendir (CHARMAP_PATH);
- if (dir == NULL)
+
+static int
+nameentcmp (const void *a, const void *b)
+{
+ return strcoll (((const struct nameent *) a)->name,
+ ((const struct nameent *) b)->name);
+}
+
+
+static int
+write_archive_locales (void **all_datap, char *linebuf)
+{
+ struct stat64 st;
+ void *all_data = *all_datap;
+ size_t len = 0;
+ struct locarhead *head;
+ struct namehashent *namehashtab;
+ char *addr = MAP_FAILED;
+ int fd, ret = 0;
+ uint32_t cnt;
+
+ fd = open64 (ARCHIVE_NAME, O_RDONLY);
+ if (fd < 0)
+ return 0;
+
+ if (fstat64 (fd, &st) < 0 || st.st_size < sizeof (*head))
+ goto error_out;
+
+ len = st.st_size;
+ addr = mmap64 (NULL, len, PROT_READ, MAP_SHARED, fd, 0);
+ if (addr == MAP_FAILED)
+ goto error_out;
+
+ head = (struct locarhead *) addr;
+ if (head->namehash_offset + head->namehash_size > len
+ || head->string_offset + head->string_size > len
+ || head->locrectab_offset + head->locrectab_size > len
+ || head->sumhash_offset + head->sumhash_size > len)
+ goto error_out;
+
+ namehashtab = (struct namehashent *) (addr + head->namehash_offset);
+ if (! verbose)
{
- error (1, errno, gettext ("cannot read character map directory `%s'"),
- CHARMAP_PATH);
- return;
+ for (cnt = 0; cnt < head->namehash_size; ++cnt)
+ if (namehashtab[cnt].locrec_offset != 0)
+ {
+ PUT (xstrdup (addr + namehashtab[cnt].name_offset));
+ ++ret;
+ }
}
+ else
+ {
+ struct nameent *names;
+ uint32_t used;
- /* Now we can look for all files in the directory. */
- while ((dirent = readdir (dir)) != NULL)
- if (strcmp (dirent->d_name, ".") != 0
- && strcmp (dirent->d_name, "..") != 0)
- {
- char *buf = NULL;
- mode_t mode;
-
-#ifdef _DIRENT_HAVE_D_TYPE
- if (dirent->d_type != DT_UNKNOWN)
- mode = DTTOIF (dirent->d_type);
- else
-#endif
+ names = (struct nameent *) xmalloc (head->namehash_used
+ * sizeof (struct nameent));
+ for (cnt = used = 0; cnt < head->namehash_size; ++cnt)
+ if (namehashtab[cnt].locrec_offset != 0)
{
- struct stat st;
+ names[used].name = addr + namehashtab[cnt].name_offset;
+ names[used++].locrec_offset = namehashtab[cnt].locrec_offset;
+ }
- buf = alloca (sizeof (CHARMAP_PATH) + strlen (dirent->d_name) + 1);
+ /* Sort the names. */
+ qsort (names, used, sizeof (struct nameent), nameentcmp);
- stpcpy (stpcpy (stpcpy (buf, CHARMAP_PATH), "/"), dirent->d_name);
+ for (cnt = 0; cnt < used; ++cnt)
+ {
+ struct locrecent *locrec;
- if (stat (buf, &st) < 0)
- continue;
- mode = st.st_mode;
- }
+ PUT (xstrdup (names[cnt].name));
- if (S_ISREG (mode))
- {
- FILE *fp;
+ if (cnt)
+ putchar_unlocked ('\n');
- PUT (strdup (dirent->d_name));
+ printf ("locale: %-15.15s archive: " ARCHIVE_NAME "\n%s\n",
+ names[cnt].name, linebuf);
- /* Read the file and learn about the code set name. */
- if (buf == NULL)
- {
- buf = alloca (sizeof (CHARMAP_PATH)
- + strlen (dirent->d_name) + 1);
+ locrec = (struct locrecent *) (addr + names[cnt].locrec_offset);
- stpcpy (stpcpy (stpcpy (buf, CHARMAP_PATH), "/"),
- dirent->d_name);
- }
+ print_LC_IDENTIFICATION (addr
+ + locrec->record[LC_IDENTIFICATION].offset,
+ locrec->record[LC_IDENTIFICATION].len);
- fp = fopen (buf, "r");
- if (fp != NULL)
- {
- char *name = NULL;
+ print_LC_CTYPE (addr + locrec->record[LC_CTYPE].offset,
+ locrec->record[LC_CTYPE].len);
+ }
- while (!feof (fp))
- {
- char junk[BUFSIZ];
+ ret = used;
+ }
- if (fscanf (fp, " <code_set_name> %as", &name) == 1)
- break;
+error_out:
+ if (addr != MAP_FAILED)
+ munmap (addr, len);
+ close (fd);
+ *all_datap = all_data;
+ return ret;
+}
- while (fgets (junk, sizeof junk, fp) != NULL
- && strchr (junk, '\n') == NULL)
- continue;
- }
- fclose (fp);
+/* Write the names of all available character maps to stdout. */
+static void
+write_charmaps (void)
+{
+ void *all_data = NULL;
+ CHARMAP_DIR *dir;
+ const char *dirent;
- if (name != NULL)
- PUT (name);
- }
- }
- }
+ /* Look for all files in the charmap directory. */
+ dir = charmap_opendir (CHARMAP_PATH);
+ if (dir == NULL)
+ return;
- closedir (dir);
+ while ((dirent = charmap_readdir (dir)) != NULL)
+ {
+ char **aliases;
+ char **p;
+
+ PUT (xstrdup (dirent));
+
+ aliases = charmap_aliases (CHARMAP_PATH, dirent);
+
+#if 0
+ /* Add the code_set_name and the aliases. */
+ for (p = aliases; *p; p++)
+ PUT (xstrdup (*p));
+#else
+ /* Add the code_set_name only. Most aliases are obsolete. */
+ p = aliases;
+ if (*p)
+ PUT (xstrdup (*p));
+#endif
+
+ charmap_free_aliases (aliases);
+ }
+
+ charmap_closedir (dir);
twalk (all_data, print_names);
}
{
size_t cat_no;
const char *lcall = getenv ("LC_ALL");
- const char *lang = getenv ("LANG") ? : "POSIX";
+ const char *lang = getenv ("LANG") ? : "";
+
+ auto void get_source (const char *name);
void get_source (const char *name)
{
char *val = getenv (name);
if ((lcall ?: "")[0] != '\0' || val == NULL)
- printf ("%s=\"%s\"\n", name, (lcall ?: "")[0] ? lcall : lang);
+ printf ("%s=\"%s\"\n", name,
+ (lcall ?: "")[0] ? lcall : (lang ?: "")[0] ? lang : "POSIX");
else
printf ("%s=%s\n", name, val);
}
/* Now all categories in an unspecified order. */
for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
- get_source (category[cat_no].name);
+ if (cat_no != LC_ALL)
+ get_source (category[cat_no].name);
/* The last is the LC_ALL value. */
printf ("LC_ALL=%s\n", lcall ? : "");
}
-/* Some of the "string" we print contain non-printable characters. We
- encode them here. */
-static void
-print_escaped (const char *string)
-{
- const unsigned char *ch;
-
- ch = string;
- while ('\0' != *ch)
- {
- if (isprint (*ch))
- putchar (*ch);
- else
- printf("<0x%02x>", *ch);
- ++ch;
- }
-}
-
-
/* Show the information request for NAME. */
static void
show_info (const char *name)
{
size_t cat_no;
+ auto void print_item (struct cat_item *item);
+
void print_item (struct cat_item *item)
{
- if (show_keyword_name != 0)
- printf ("%s=", item->name);
-
switch (item->value_type)
{
case string:
if (show_keyword_name)
- putchar ('"');
- print_escaped (nl_langinfo (item->item_id) ? : "");
+ printf ("%s=\"", item->name);
+ fputs (nl_langinfo (item->item_id) ? : "", stdout);
if (show_keyword_name)
putchar ('"');
+ putchar ('\n');
break;
case stringarray:
{
const char *val;
if (show_keyword_name)
- putchar ('"');
+ printf ("%s=\"", item->name);
for (cnt = 0; cnt < item->max - 1; ++cnt)
{
val = nl_langinfo (item->item_id + cnt);
if (val != NULL)
- print_escaped (val);
+ fputs (val, stdout);
putchar (';');
}
val = nl_langinfo (item->item_id + cnt);
if (val != NULL)
- print_escaped (val);
+ fputs (val, stdout);
if (show_keyword_name)
putchar ('"');
+ putchar ('\n');
}
break;
case stringlist:
{
int first = 1;
const char *val = nl_langinfo (item->item_id) ? : "";
+ int cnt;
+
+ if (show_keyword_name)
+ printf ("%s=", item->name);
- while (*val != '\0')
+ for (cnt = 0; cnt < item->max && *val != '\0'; ++cnt)
{
printf ("%s%s%s%s", first ? "" : ";",
show_keyword_name ? "\"" : "", val,
val = strchr (val, '\0') + 1;
first = 0;
}
+ putchar ('\n');
}
break;
case byte:
{
const char *val = nl_langinfo (item->item_id);
+ if (show_keyword_name)
+ printf ("%s=", item->name);
+
if (val != NULL)
- printf ("%d", *val == CHAR_MAX ? -1 : *val);
+ printf ("%d", *val == '\177' ? -1 : *val);
+ putchar ('\n');
}
break;
case bytearray:
const char *val = nl_langinfo (item->item_id);
int cnt = val ? strlen (val) : 0;
+ if (show_keyword_name)
+ printf ("%s=", item->name);
+
while (cnt > 1)
{
- printf ("%d;", *val == CHAR_MAX ? -1 : *val);
+ printf ("%d;", *val == '\177' ? -1 : *val);
--cnt;
++val;
}
- printf ("%d", cnt == 0 || *val == CHAR_MAX ? -1 : *val);
+ printf ("%d\n", cnt == 0 || *val == '\177' ? -1 : *val);
}
break;
case word:
{
- unsigned int val = (unsigned int) nl_langinfo (item->item_id);
- printf ("%d", val);
+ union { unsigned int word; char *string; } val;
+ val.string = nl_langinfo (item->item_id);
+ if (show_keyword_name)
+ printf ("%s=", item->name);
+
+ printf ("%d\n", val.word);
}
break;
+ case wstring:
+ case wstringarray:
+ case wstringlist:
+ /* We don't print wide character information since the same
+ information is available in a multibyte string. */
default:
+ break;
+
}
- putchar ('\n');
}
for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
- {
- size_t item_no;
-
- if (strcmp (name, category[cat_no].name) == 0)
- /* Print the whole category. */
- {
- if (show_category_name != 0)
- puts (category[cat_no].name);
-
- for (item_no = 0; item_no < category[cat_no].number; ++item_no)
- print_item (&category[cat_no].item_desc[item_no]);
-
- return;
- }
+ if (cat_no != LC_ALL)
+ {
+ size_t item_no;
- for (item_no = 0; item_no < category[cat_no].number; ++item_no)
- if (strcmp (name, category[cat_no].item_desc[item_no].name) == 0)
+ if (strcmp (name, category[cat_no].name) == 0)
+ /* Print the whole category. */
{
if (show_category_name != 0)
puts (category[cat_no].name);
- print_item (&category[cat_no].item_desc[item_no]);
+ for (item_no = 0; item_no < category[cat_no].number; ++item_no)
+ print_item (&category[cat_no].item_desc[item_no]);
+
return;
}
- }
+
+ for (item_no = 0; item_no < category[cat_no].number; ++item_no)
+ if (strcmp (name, category[cat_no].item_desc[item_no].name) == 0)
+ {
+ if (show_category_name != 0)
+ puts (category[cat_no].name);
+
+ print_item (&category[cat_no].item_desc[item_no]);
+ return;
+ }
+ }
/* The name is not a standard one.
For testing and perhaps advanced use allow some more symbols. */
projects / platform / upstream / glibc.git / blobdiff