mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
b17277cfa2
1998-05-15 14:36 Ulrich Drepper <drepper@cygnus.com> * posix/wordexp-test.c: Avoid duplicate messages. * sysdeps/generic/setenv.c: Use __tfind and __tsearch, not tfind and tsearch. Correctly interpret values returned by those functions. (unsetenv): Store pointer to string, not pointer to string pointer. * time/tzfile.c (__tzfile_compute): Take new arguments. Store DST information and offset in them. * time/tzset.c (__tz_convert): Pass extra parameters to __tzfile_compute. Compute equivalent values for use of tz_rules. 1998-05-15 00:49:11 Zack Weinberg <zack@rabi.phys.columbia.edu> * iconvdata/Makefile (gen-8bit-table): Use move-if-change and stamp files to avoid unnecessary recompilation. (gen-8bit-gap-table): Likewise. (move-if-change): New variable. (all generated .h rules): Change to be .stmp rules. (%.h): New rule; depend on %.stmp; no commands. (distribute): Add gen-8bit.sh, gen-8bit-gap.sh, gen-8bit-gap-1.sh. 1998-05-15 01:09 Zack Weinberg <zack@rabi.phys.columbia.edu> * Makerules (libc-map): Deleted. (load-map-file): Set to the appropriate compiler switch, not just the file name. If libfoo-map is not set, look for a libfoo.map in the current directory and $(..). (map-file): New variable, contains just the mapfile name. (build-shlib): Adjust for new value of load-map-file. (libc.so): Correct dependencies. * extra-lib.mk: Correct shlib dependencies since libfoo-map may not be set anymore. * elf/Makefile: Set ld-map to $(..)libc.map, not $(libc-map). Delete libdl-map. Tweak ld.so link rule to work with changed variable settings in Makerules. * iconvdata/Makefile: Tweak build-module to work with changed variable settings in Makerules. * db/Makefile: Delete libdb-map. * hesiod/Makefile: Delete libnss_hesiod-map. * linuxthreads/Makefile: Delete libpthread-map. * locale/Makefile: Delete libBrokenLocale-map. * login/Makefile: Delete libutil-map. * math/Makefile: Delete libm-map. * md5-crypt/Makefile: Delete libcrypt-map. * nis/Makefile: Delete libnsl-map, libnss_nis-map, libnss_nisplus-map, and libnss_compat-map. * nss/Makefile: Delete libnss_files-map, libnss_db-map, and libnss_ldap-map. * resolv/Makefile: Delete libresolv-map and libnss_dns-map. * rt/Makefile: Delete librt-map. 1998-05-15 01:06 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Instead of substituting `yes' or `no' for whether --no-whole-archive is available, set @no_whole_archive@ to the appropriate gcc switch or the empty string. Likewise for -fno-exceptions. * config.make.in: Replace have-no-whole-archive with no-whole-archive and have-no-exceptions with no-exceptions. * Makerules: Delete stanzas setting no-whole-archive and no-exceptions. * sunrpc/Makefile: Use move-if-change to update generated .h and .c files. 1998-05-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * wcsmbs/wcsmbsload.c (extract_charset_name): Use strcspn instead of strchr loop. 1998-05-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/tzfile.c (__tzfile_read): Remove unused variable info. (__tzfile_compute): Likewise. 1998-05-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/socket.h (AF_SNA,PF_SNA): Add new defines from Linux 2.1.102.
193 lines
5.5 KiB
C
193 lines
5.5 KiB
C
/* Copyright (C) 1998 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 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. */
|
|
|
|
#include <langinfo.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <locale/localeinfo.h>
|
|
#include <wcsmbsload.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <iconv/gconv_int.h>
|
|
|
|
|
|
/* Last loaded locale for LC_CTYPE. We initialize for the C locale
|
|
which is enabled at startup. */
|
|
extern const struct locale_data _nl_C_LC_CTYPE;
|
|
const struct locale_data *__wcsmbs_last_locale = &_nl_C_LC_CTYPE;
|
|
|
|
|
|
/* These are the descriptions for the default conversion functions. */
|
|
static struct gconv_step to_wc =
|
|
{
|
|
shlib_handle: NULL,
|
|
modname: NULL,
|
|
counter: INT_MAX,
|
|
from_name: "ANSI_X3.4-1968//",
|
|
to_name: "INTERNAL",
|
|
fct: __gconv_transform_ascii_internal,
|
|
init_fct: NULL,
|
|
end_fct: NULL,
|
|
data: NULL
|
|
};
|
|
|
|
static struct gconv_step to_mb =
|
|
{
|
|
shlib_handle: NULL,
|
|
modname: NULL,
|
|
counter: INT_MAX,
|
|
from_name: "INTERNAL",
|
|
to_name: "ANSI_X3.4-1968//",
|
|
fct: __gconv_transform_internal_ascii,
|
|
init_fct: NULL,
|
|
end_fct: NULL,
|
|
data: NULL
|
|
};
|
|
|
|
|
|
/* For the default locale we only have to handle ANSI_X3.4-1968. */
|
|
struct gconv_fcts __wcsmbs_gconv_fcts =
|
|
{
|
|
towc: &to_wc,
|
|
tomb: &to_mb
|
|
};
|
|
|
|
|
|
static inline struct gconv_step *
|
|
getfct (const char *to, const char *from)
|
|
{
|
|
size_t nsteps;
|
|
struct gconv_step *result;
|
|
|
|
if (__gconv_find_transform (to, from, &result, &nsteps) != GCONV_OK)
|
|
/* Loading the conversion step is not possible. */
|
|
return NULL;
|
|
|
|
/* We must only have one step in this conversion. */
|
|
if (nsteps != 1)
|
|
return NULL;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Extract from the given locale name the character set portion. Since
|
|
only the XPG form of the name includes this information we don't have
|
|
to take care for the CEN form. */
|
|
#define extract_charset_name(str) \
|
|
({ \
|
|
const char *cp = str; \
|
|
char *result = NULL; \
|
|
\
|
|
cp += strcspn (cp, "@.+,"); \
|
|
if (*cp == '.') \
|
|
{ \
|
|
const char *endp = ++cp; \
|
|
while (*endp != '\0' && *endp != '@') \
|
|
++endp; \
|
|
if (endp != cp) \
|
|
result = strndupa (cp, endp - cp); \
|
|
} \
|
|
result; \
|
|
})
|
|
|
|
|
|
/* The gconv functions expects the name to be complete, including the
|
|
trailing shashes if necessary. */
|
|
#define add_slashes(str) \
|
|
({ \
|
|
const char *cp = str; \
|
|
char *result; \
|
|
char *tmp; \
|
|
size_t cnt = 0; \
|
|
\
|
|
while (*cp != '\0') \
|
|
if (*cp++ == '/') \
|
|
++cnt; \
|
|
\
|
|
result = alloca (cp - str + 3); \
|
|
tmp = __mempcpy (result, str, cp - str); \
|
|
if (cnt < 2) \
|
|
{ \
|
|
*tmp++ = '/'; \
|
|
if (cnt < 1) \
|
|
*tmp++ = '/'; \
|
|
} \
|
|
*tmp = '\0'; \
|
|
result; \
|
|
})
|
|
|
|
|
|
/* Load conversion functions for the currently selected locale. */
|
|
void
|
|
__wcsmbs_load_conv (const struct locale_data *new_category)
|
|
{
|
|
/* We must modify global data. */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
/* Acquire the lock. */
|
|
__libc_lock_lock (lock);
|
|
|
|
/* We should repest the test since while we waited some other thread
|
|
might have run this function. */
|
|
if (__wcsmbs_last_locale != new_category)
|
|
{
|
|
if (new_category->name == _nl_C_name) /* Yes, pointer comparison. */
|
|
{
|
|
failed:
|
|
__wcsmbs_gconv_fcts.towc = &to_wc;
|
|
__wcsmbs_gconv_fcts.tomb = &to_mb;
|
|
}
|
|
else
|
|
{
|
|
/* We must find the real functions. */
|
|
const char *charset_name;
|
|
const char *complete_name;
|
|
|
|
/* Get name of charset of the locale. We first examine
|
|
whether we have a character set mentioned in the locale
|
|
name. If this isn't the case we use the information from
|
|
the locale files. */
|
|
charset_name = extract_charset_name (setlocale (LC_CTYPE, NULL));
|
|
if (charset_name == NULL)
|
|
charset_name =
|
|
new_category->values[_NL_ITEM_INDEX(CODESET)].string;
|
|
|
|
/* Add the slashes necessary for a complete lookup. */
|
|
complete_name = add_slashes (charset_name);
|
|
|
|
__wcsmbs_gconv_fcts.tomb = getfct (complete_name, "INTERNAL");
|
|
__wcsmbs_gconv_fcts.towc = getfct ("INTERNAL", complete_name);
|
|
|
|
/* If any of the conversion functions is not available we don't
|
|
use any since this would mean we cannot convert back and
|
|
forth.*/
|
|
if (__wcsmbs_gconv_fcts.towc == NULL
|
|
|| __wcsmbs_gconv_fcts.tomb == NULL)
|
|
goto failed;
|
|
}
|
|
|
|
/* Set last-used variable for current locale. */
|
|
__wcsmbs_last_locale = new_category;
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
}
|