mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 21:40:12 +00:00
faaa6f6283
2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/testdata/EUC-JISX0213: New file. * iconvdata/testdata/EUC-JISX0213..UTF8: New file. * iconvdata/testdata/SHIFT_JISX0213: New file. * iconvdata/testdata/SHIFT_JISX0213..UTF8: New file. * iconvdata/testdata/ISO-2022-JP-3: New file. * iconvdata/testdata/ISO-2022-JP-3..UTF8: New file. * iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3. * iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap contains comments indicating precomposed characters. 2002-04-21 Bruno Haible <bruno@clisp.org> * iconvdata/iso-2022-jp-3.c: New file. * iconvdata/gconv-modules (ISO-2022-JP-3): New module. * iconvdata/Makefile (modules): Add ISO-2022-JP-3. (LDFLAGS-ISO-2022-JP-3.so): New variable. (ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so. (distribute): Add iso-2022-jp-3.c. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/tst-table-to.c (main): Restore handling of transliterations, broken by last patch. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/TESTS: Add IBM922, IBM1124, IBM1129. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr when there is not enough room in the output buffer. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. 2002-04-20 Bruno Haible <bruno@clisp.org> * iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New macros. (RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}. Also make this macro work if FROM_DIRECTION evaluates to 0. (gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}. (FUNCTION_NAME): Likewise, in the handling of unaligned accesses and of consume_incomplete. * iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 4, not 8. * iconvdata/cp1258.c: Likewise. * iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3, not 2. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm937.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/iso-2022-cn.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4. * iconvdata/iso-2022-cn-ext.c: Likewise. * iconvdata/iso-2022-jp.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. * iconvdata/tcvn5712-1.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2. * iconvdata/euc-jisx0213.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4. * iconvdata/shift_jisx0213.c: Likewise. 2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2, shdi3, fixdfdi, fixsfdi in csu dir. (shared-only-routines): Likewise. * sysdeps/wordsize-32/cmpdi2.c: New file. * sysdeps/wordsize-32/shdi3.c: New file. * sysdeps/wordsize-32/fixdfdi.c: New file. * sysdeps/wordsize-32/fixsfdi.c: New file. * sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3, __ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi, __fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0. * sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl): Only use va_arg if the argument will be used [PR libc/3259]. 2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com> * catgets/catgets.c (catopen): Free buffer if internal catalog open fails. 2002-05-14 Ulrich Drepper <drepper@redhat.com> * debug/xtrace.sh: Make more robust. For realtime tracking use non-buffering methods. * debug/pcprofiledump.c: Implement -u option. Patch by Roger Luethi <rl@hellgate.ch>.
146 lines
3.7 KiB
C
146 lines
3.7 KiB
C
/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.org>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <alloca.h>
|
|
#include <errno.h>
|
|
#include <locale.h>
|
|
#include <nl_types.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
|
|
#include "catgetsinfo.h"
|
|
|
|
|
|
/* Open the catalog and return a descriptor for the catalog. */
|
|
nl_catd
|
|
catopen (const char *cat_name, int flag)
|
|
{
|
|
__nl_catd result;
|
|
const char *env_var = NULL;
|
|
const char *nlspath = NULL;
|
|
|
|
if (strchr (cat_name, '/') == NULL)
|
|
{
|
|
if (flag == NL_CAT_LOCALE)
|
|
/* Use the current locale setting for LC_MESSAGES. */
|
|
env_var = setlocale (LC_MESSAGES, NULL);
|
|
else
|
|
/* Use the LANG environment variable. */
|
|
env_var = getenv ("LANG");
|
|
|
|
if (env_var == NULL || *env_var == '\0'
|
|
|| (__libc_enable_secure && strchr (env_var, '/') != NULL))
|
|
env_var = "C";
|
|
|
|
nlspath = getenv ("NLSPATH");
|
|
if (nlspath != NULL && *nlspath != '\0')
|
|
{
|
|
/* Append the system dependent directory. */
|
|
size_t len = strlen (nlspath) + 1 + sizeof NLSPATH;
|
|
char *tmp = alloca (len);
|
|
|
|
__stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
|
|
nlspath = tmp;
|
|
}
|
|
else
|
|
nlspath = NLSPATH;
|
|
}
|
|
|
|
result = (__nl_catd) malloc (sizeof (*result));
|
|
if (result == NULL)
|
|
/* We cannot get enough memory. */
|
|
return (nl_catd) -1;
|
|
|
|
if (__open_catalog (cat_name, nlspath, env_var, result) != 0)
|
|
{
|
|
/* Couldn't open the file. */
|
|
free ((void *) result);
|
|
return (nl_catd) -1;
|
|
}
|
|
|
|
return (nl_catd) result;
|
|
}
|
|
|
|
|
|
/* Return message from message catalog. */
|
|
char *
|
|
catgets (nl_catd catalog_desc, int set, int message, const char *string)
|
|
{
|
|
__nl_catd catalog;
|
|
size_t idx;
|
|
size_t cnt;
|
|
|
|
/* Be generous if catalog which failed to be open is used. */
|
|
if (catalog_desc == (nl_catd) -1 || ++set <= 0 || message < 0)
|
|
return (char *) string;
|
|
|
|
catalog = (__nl_catd) catalog_desc;
|
|
|
|
idx = ((set * message) % catalog->plane_size) * 3;
|
|
cnt = 0;
|
|
do
|
|
{
|
|
if (catalog->name_ptr[idx + 0] == (u_int32_t) set
|
|
&& catalog->name_ptr[idx + 1] == (u_int32_t) message)
|
|
return (char *) &catalog->strings[catalog->name_ptr[idx + 2]];
|
|
|
|
idx += catalog->plane_size * 3;
|
|
}
|
|
while (++cnt < catalog->plane_depth);
|
|
|
|
__set_errno (ENOMSG);
|
|
return (char *) string;
|
|
}
|
|
|
|
|
|
/* Return resources used for loaded message catalog. */
|
|
int
|
|
catclose (nl_catd catalog_desc)
|
|
{
|
|
__nl_catd catalog;
|
|
|
|
/* Be generous if catalog which failed to be open is used. */
|
|
if (catalog_desc == (nl_catd) -1)
|
|
{
|
|
__set_errno (EBADF);
|
|
return -1;
|
|
}
|
|
|
|
catalog = (__nl_catd) catalog_desc;
|
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
if (catalog->status == mmapped)
|
|
__munmap ((void *) catalog->file_ptr, catalog->file_size);
|
|
else
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
if (catalog->status == malloced)
|
|
free ((void *) catalog->file_ptr);
|
|
else
|
|
{
|
|
__set_errno (EBADF);
|
|
return -1;
|
|
}
|
|
|
|
free ((void *) catalog);
|
|
|
|
return 0;
|
|
}
|