mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 17:11:06 +00:00
900bec852d
1997-06-15 00:43 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Define libc-map here. * Makefile: And remove definition here. * Makerules (load-map-file): Handle case where map file is in other directory. (build-shlib): Likewise. * libc.map: Add more symbols. * resolv/libresolv.map: Likewise. * db/libdb.map: Add __dbopen. Patch by HJ Lu. * libio/stdio.h: Remove "optmizations" for vfscanf and vsscanf. * locale/programs/localedef.c: Add normalize_codeset function. We don't want to use the _nl_normalize_codeset functions from libc. * sysdeps/libm-i387/s_asinh.S: Handle +-Inf and NaN correctly. * sysdeps/libm-i387/s_asinhf.S: Likewise. * sysdeps/libm-i387/s_asinhl.S: Likewise. * sysdeps/libm-i387/s_nearbyint.S: Correctly leave function. * sysdeps/libm-i387/s_nearbyintf.S: Likewise. * sysdeps/libm-i387/s_nearbyintl.S: Likewise. 1997-06-14 12:45 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_nis/nis-ethers.c: Add static to internal_nis_setetherent. * nis/nss_nis/nis-proto.c: Add static to internal_nis_setprotoent. * nis/nss_nisplus/nisplus-hosts.c: Rewrite parser and fix _nss_nisplus_gethostbyaddr_r interface. * nis/libnsl.map: Add all GLOBAL functions. 1997-06-13 18:32 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libm-test.c (main): Call new tests, reorder tests. (fmod_test): Test function fmod. (nearbyint_test): Test function nearbyint. (acos_test): Add more test cases. (signbit_test): Test macro signbit. (output_result_bool): Output result if test fails. (asin_test): Add another test case. (atan2_test): Add more tests. (asinh_test): Add more tests. (atanh_test): Add more tests. (hypot_test): Add more tests. (isfinite_test): Test macro isfinite. (isnormal_test): Test macro isnormal. (sincos_test): Tests for sincos. (main): Enable remquo_test since the tests are correct (according to ANSI/IEEE 754-1985). (remquo_test): Corrected tests cases and added more tests. (remainder_test): Tests for remainder. (check_int): New Function to compare int values. (check_isnan_exc_ext): New function. (sqrt_test): Add some extra tests for sqrt. (erf_test): Tests for erf. (erfc_test): Tests for erfc. (gamma_test): Tests for gamma. (lgamma_test): Tests for lgamma. 1997-06-08 10:54 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/configure.in: Try to generate stdio_lim.h using the target C preprocessor and mk-stdiolim.c. * sysdeps/unix/sysv/linux/stdio_lim.h.in: New, template for stdio_lim.h. * sysdeps/unix/sysv/linux/mk-stdiolim.c: New, used by the target C preprocessor to extract OPEN_MAX and PATH_MAX. 1997-06-14 17:32 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm.map: Add inline functions, global variables.
559 lines
14 KiB
C
559 lines
14 KiB
C
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 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.
|
|
|
|
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.
|
|
|
|
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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <argp.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "error.h"
|
|
#include "charset.h"
|
|
#include "locfile.h"
|
|
|
|
/* Undefine the following line in the production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
|
|
/* List of locale definition files which are used in `copy' instructions. */
|
|
struct copy_def_list_t
|
|
{
|
|
struct copy_def_list_t *next;
|
|
|
|
const char *name;
|
|
int mask;
|
|
|
|
struct localedef_t *locale;
|
|
|
|
struct
|
|
{
|
|
void *data;
|
|
size_t len;
|
|
} binary[6];
|
|
};
|
|
|
|
|
|
/* List of copied locales. */
|
|
struct copy_def_list_t *copy_list;
|
|
|
|
/* If this is defined be POSIX conform. */
|
|
int posix_conformance;
|
|
|
|
/* If not zero give a lot more messages. */
|
|
int verbose;
|
|
|
|
/* If not zero suppress warnings and information messages. */
|
|
int be_quiet;
|
|
|
|
/* If not zero force output even if warning were issued. */
|
|
static int force_output;
|
|
|
|
/* Name of the character map file. */
|
|
static const char *charmap_file;
|
|
|
|
/* Name of the locale definition file. */
|
|
static const char *input_file;
|
|
|
|
/* Name of the UCS file. */
|
|
static const char *ucs_csn;
|
|
|
|
|
|
/* 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;
|
|
|
|
#define OPT_POSIX 1
|
|
#define OPT_QUIET 2
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ NULL, 0, NULL, 0, N_("Input Files:") },
|
|
{ "charmap", 'f', "FILE", 0,
|
|
N_("Symbolic character names defined in FILE") },
|
|
{ "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") },
|
|
{ "code-set-name", 'u', "NAME", OPTION_HIDDEN,
|
|
N_("Specify code set for mapping ISO 10646 elements") },
|
|
|
|
{ NULL, 0, NULL, 0, N_("Output control:") },
|
|
{ "force", 'c', NULL, 0,
|
|
N_("Create output even if warning messages were issued") },
|
|
{ "posix", OPT_POSIX, NULL, 0, N_("Be strictly POSIX conform") },
|
|
{ "quiet", OPT_QUIET, NULL, 0,
|
|
N_("Suppress warnings and information messages") },
|
|
{ "verbose", 'V', NULL, 0, N_("Print more messages") },
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("Compile locale specification");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("NAME");
|
|
|
|
/* 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
|
|
};
|
|
|
|
|
|
/* Prototypes for global functions. */
|
|
void *xmalloc (size_t __n);
|
|
|
|
/* Prototypes for local functions. */
|
|
static void error_print (void);
|
|
static const char *construct_output_path (char *path);
|
|
static const char *normalize_codeset (const char *codeset, size_t name_len);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *output_path;
|
|
int cannot_write_why;
|
|
struct charset_t *charset;
|
|
struct localedef_t *localedef;
|
|
struct copy_def_list_t *act_add_locdef;
|
|
int remaining;
|
|
|
|
/* Set initial values for global variables. */
|
|
copy_list = NULL;
|
|
posix_conformance = getenv ("POSIXLY_CORRECT") != NULL;
|
|
error_print_progname = error_print;
|
|
|
|
/* Set locale. Do not set LC_ALL because the other categories must
|
|
not be affected (according to POSIX.2). */
|
|
setlocale (LC_MESSAGES, "");
|
|
setlocale (LC_CTYPE, "");
|
|
|
|
/* Initialize the message catalog. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_err_exit_status = 4;
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
/* POSIX.2 requires to be verbose about missing characters in the
|
|
character map. */
|
|
verbose |= posix_conformance;
|
|
|
|
if (argc - remaining != 1)
|
|
{
|
|
/* We need exactly one non-option parameter. */
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
|
|
program_invocation_short_name);
|
|
exit (4);
|
|
}
|
|
|
|
/* The parameter describes the output path of the constructed files.
|
|
If the described files cannot be written return a NULL pointer. */
|
|
output_path = construct_output_path (argv[remaining]);
|
|
cannot_write_why = errno;
|
|
|
|
/* Now that the parameters are processed we have to reset the local
|
|
ctype locale. (P1003.2 4.35.5.2) */
|
|
setlocale (LC_CTYPE, "POSIX");
|
|
|
|
/* Look whether the system really allows locale definitions. POSIX
|
|
defines error code 3 for this situation so I think it must be
|
|
a fatal error (see P1003.2 4.35.8). */
|
|
if (sysconf (_SC_2_LOCALEDEF) < 0)
|
|
error (3, 0, _("FATAL: system does not define `_POSIX2_LOCALEDEF'"));
|
|
|
|
/* Process charmap file. */
|
|
charset = charmap_read (charmap_file);
|
|
|
|
/* Now read the locale file. */
|
|
localedef = locfile_read (input_file, charset);
|
|
if (localedef->failed != 0)
|
|
error (4, errno, _("cannot open locale definition file `%s'"), input_file);
|
|
|
|
/* Perhaps we saw some `copy' instructions. Process the given list.
|
|
We use a very simple algorithm: we look up the list from the
|
|
beginning every time. */
|
|
do
|
|
{
|
|
int cat;
|
|
|
|
for (act_add_locdef = copy_list; act_add_locdef != NULL;
|
|
act_add_locdef = act_add_locdef->next)
|
|
{
|
|
for (cat = LC_CTYPE; cat <= LC_MESSAGES; ++cat)
|
|
if ((act_add_locdef->mask & (1 << cat)) != 0)
|
|
{
|
|
act_add_locdef->mask &= ~(1 << cat);
|
|
break;
|
|
}
|
|
if (cat <= LC_MESSAGES)
|
|
break;
|
|
}
|
|
|
|
if (act_add_locdef != NULL)
|
|
{
|
|
int avail = 0;
|
|
|
|
if (act_add_locdef->locale == NULL)
|
|
act_add_locdef->locale = locfile_read (act_add_locdef->name,
|
|
charset);
|
|
|
|
if (! act_add_locdef->locale->failed)
|
|
{
|
|
avail = act_add_locdef->locale->categories[cat].generic != NULL;
|
|
if (avail)
|
|
localedef->categories[cat].generic
|
|
= act_add_locdef->locale->categories[cat].generic;
|
|
}
|
|
|
|
if (! avail)
|
|
{
|
|
static const char *locale_names[] =
|
|
{
|
|
"LC_COLLATE", "LC_CTYPE", "LC_MONETARY",
|
|
"LC_NUMERIC", "LC_TIME", "LC_MESSAGES"
|
|
};
|
|
char *fname;
|
|
int fd;
|
|
struct stat st;
|
|
|
|
asprintf (&fname, LOCALEDIR "/%s/%s", act_add_locdef->name,
|
|
locale_names[cat]);
|
|
fd = open (fname, O_RDONLY);
|
|
if (fd == -1)
|
|
{
|
|
free (fname);
|
|
|
|
asprintf (&fname, LOCALEDIR "/%s/%s/SYS_%s",
|
|
act_add_locdef->name, locale_names[cat],
|
|
locale_names[cat]);
|
|
|
|
fd = open (fname, O_RDONLY);
|
|
if (fd == -1)
|
|
error (5, 0, _("\
|
|
locale file `%s', used in `copy' statement, not found"),
|
|
act_add_locdef->name);
|
|
}
|
|
|
|
if (fstat (fd, &st) < 0)
|
|
error (5, errno, _("\
|
|
cannot `stat' locale file `%s'"),
|
|
fname);
|
|
|
|
localedef->len[cat] = st.st_size;
|
|
localedef->categories[cat].generic
|
|
= mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
|
|
|
|
if (localedef->categories[cat].generic == (void *) -1)
|
|
{
|
|
size_t left = st.st_size;
|
|
void *read_ptr;
|
|
|
|
localedef->categories[cat].generic
|
|
= xmalloc (st.st_size);
|
|
read_ptr = localedef->categories[cat].generic;
|
|
|
|
do
|
|
{
|
|
long int n;
|
|
n = read (fd, read_ptr, left);
|
|
if (n == -1)
|
|
error (5, errno, _("cannot read locale file `%s'"),
|
|
fname);
|
|
read_ptr += n;
|
|
left -= n;
|
|
}
|
|
while (left > 0);
|
|
}
|
|
|
|
close (fd);
|
|
free (fname);
|
|
|
|
localedef->binary |= 1 << cat;
|
|
}
|
|
}
|
|
}
|
|
while (act_add_locdef != NULL);
|
|
|
|
/* Check the categories we processed in source form. */
|
|
check_all_categories (localedef, charset);
|
|
|
|
/* We are now able to write the data files. If warning were given we
|
|
do it only if it is explicitly requested (--force). */
|
|
if (error_message_count == 0 || force_output != 0)
|
|
{
|
|
if (cannot_write_why != 0)
|
|
error (4, cannot_write_why, _("cannot write output files to `%s'"),
|
|
output_path);
|
|
else
|
|
write_all_categories (localedef, charset, output_path);
|
|
}
|
|
else
|
|
error (4, 0, _("no output file produced because warning were issued"));
|
|
|
|
/* This exit status is prescribed by POSIX.2 4.35.7. */
|
|
exit (error_message_count != 0);
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case OPT_QUIET:
|
|
be_quiet = 1;
|
|
break;
|
|
case OPT_POSIX:
|
|
posix_conformance = 1;
|
|
break;
|
|
case 'c':
|
|
force_output = 1;
|
|
break;
|
|
case 'f':
|
|
charmap_file = arg;
|
|
break;
|
|
case 'i':
|
|
input_file = arg;
|
|
break;
|
|
case 'u':
|
|
ucs_csn = arg;
|
|
break;
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
more_help (int key, const char *text, void *input)
|
|
{
|
|
char *cp;
|
|
|
|
switch (key)
|
|
{
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
/* We print some extra information. */
|
|
asprintf (&cp, gettext ("\
|
|
System's directory for character maps: %s\n\
|
|
locale files : %s\n\
|
|
%s"),
|
|
CHARMAP_PATH, LOCALE_PATH, gettext ("\
|
|
Report bugs using the `glibcbug' script to <bugs@gnu.ai.mit.edu>.\n"));
|
|
return cp;
|
|
default:
|
|
break;
|
|
}
|
|
return (char *) text;
|
|
}
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "localedef (GNU %s) %s\n", PACKAGE, VERSION);
|
|
fprintf (stream, gettext ("\
|
|
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");
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
}
|
|
|
|
|
|
void
|
|
def_to_process (const char *name, int category)
|
|
{
|
|
struct copy_def_list_t *new, **rp;
|
|
|
|
for (rp = ©_list; *rp != NULL; rp = &(*rp)->next)
|
|
if (strcmp (name, (*rp)->name) == 0)
|
|
break;
|
|
|
|
if (*rp == NULL)
|
|
{
|
|
size_t cnt;
|
|
|
|
*rp = (struct copy_def_list_t *) xmalloc (sizeof (**rp));
|
|
|
|
(*rp)->next = NULL;
|
|
(*rp)->name = name;
|
|
(*rp)->mask = 0;
|
|
(*rp)->locale = NULL;
|
|
|
|
for (cnt = 0; cnt < 6; ++cnt)
|
|
{
|
|
(*rp)->binary[cnt].data = NULL;
|
|
(*rp)->binary[cnt].len = 0;
|
|
}
|
|
}
|
|
new = *rp;
|
|
|
|
if ((new->mask & category) != 0)
|
|
/* We already have the information. This cannot happen. */
|
|
error (5, 0, _("\
|
|
category data requested more than once: should not happen"));
|
|
|
|
new->mask |= category;
|
|
}
|
|
|
|
|
|
/* The address of this function will be assigned to the hook in the error
|
|
functions. */
|
|
static void
|
|
error_print ()
|
|
{
|
|
/* We don't want the program name to be printed in messages. Emacs'
|
|
compile.el does not like this. */
|
|
}
|
|
|
|
|
|
/* The parameter to localedef describes the output path. If it does
|
|
contain a '/' character it is a relative path. Otherwise it names the
|
|
locale this definition is for. */
|
|
static const char *
|
|
construct_output_path (char *path)
|
|
{
|
|
const char *normal = NULL;
|
|
char *result;
|
|
|
|
if (strchr (path, '/') == NULL)
|
|
{
|
|
/* This is a system path. First examine whether the locale name
|
|
contains a reference to the codeset. This should be
|
|
normalized. */
|
|
char *startp, *endp;
|
|
|
|
startp = path;
|
|
/* We must be prepared for finding a CEN name or a location of
|
|
the introducing `.' where it is not possible anymore. */
|
|
while (*startp != '\0' && *startp != '@' && *startp != '.'
|
|
&& *startp != '+' && *startp != ',')
|
|
++startp;
|
|
if (*startp == '.')
|
|
{
|
|
/* We found a codeset specification. Now find the end. */
|
|
endp = ++startp;
|
|
while (*endp != '\0' && *endp != '@')
|
|
++endp;
|
|
|
|
if (endp > startp)
|
|
normal = normalize_codeset (startp, endp - startp);
|
|
}
|
|
else
|
|
/* This is to keep gcc quiet. */
|
|
endp = NULL;
|
|
|
|
/* We put an additional '\0' at the end of the string because at
|
|
the end of the function we need another byte for the trailing
|
|
'/'. */
|
|
if (normal == NULL)
|
|
asprintf (&result, "%s/%s%c", LOCALEDIR, path, '\0');
|
|
else
|
|
asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR, startp - path, path,
|
|
normal, endp, '\0');
|
|
}
|
|
else
|
|
{
|
|
/* This is a user path. Please note the additional byte in the
|
|
memory allocation. */
|
|
result = xmalloc (strlen (path) + 2);
|
|
strcpy (result, path);
|
|
}
|
|
|
|
errno = 0;
|
|
|
|
if (euidaccess (result, W_OK) == -1)
|
|
/* Perhaps the directory does not exist now. Try to create it. */
|
|
if (errno == ENOENT)
|
|
{
|
|
errno = 0;
|
|
mkdir (result, 0777);
|
|
}
|
|
|
|
strcat (result, "/");
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Normalize codeset name. There is no standard for the codeset
|
|
names. Normalization allows the user to use any of the common
|
|
names. */
|
|
static const char *
|
|
normalize_codeset (codeset, name_len)
|
|
const char *codeset;
|
|
size_t name_len;
|
|
{
|
|
int len = 0;
|
|
int only_digit = 1;
|
|
char *retval;
|
|
char *wp;
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < name_len; ++cnt)
|
|
if (isalnum (codeset[cnt]))
|
|
{
|
|
++len;
|
|
|
|
if (isalpha (codeset[cnt]))
|
|
only_digit = 0;
|
|
}
|
|
|
|
retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
|
|
|
|
if (retval != NULL)
|
|
{
|
|
if (only_digit)
|
|
wp = stpcpy (retval, "iso");
|
|
else
|
|
wp = retval;
|
|
|
|
for (cnt = 0; cnt < name_len; ++cnt)
|
|
if (isalpha (codeset[cnt]))
|
|
*wp++ = tolower (codeset[cnt]);
|
|
else if (isdigit (codeset[cnt]))
|
|
*wp++ = codeset[cnt];
|
|
|
|
*wp = '\0';
|
|
}
|
|
|
|
return (const char *) retval;
|
|
}
|