glibc/locale/programs/stringtrans.c
Ulrich Drepper 6e4c40baac Update.
1998-09-09 09:32  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function
	inline.

1998-09-07  Paul Eggert  <eggert@twinsun.com>

	* time/mktime.c (__EXTENSIONS__): Define if not defined.
	(_REENTRANT): Remove.  It has undesirable consequences in
	Solaris 2.6 (e.g. it turns off the putc macro).  Defining
	__EXTENSIONS__ makes localtime_r and gmtime_r visible, which
	is what we want.
	* time/strftime.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-error.c: Fix spelling.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* stdlib/strfmon.c: Quiet -Wparentheses warnings.
	* stdio-common/_itoa.c: Likewise.
	* stdio-common/printf_fp.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* wcsmbs/wcstok.c: Likewise.
	* sysdeps/generic/glob.c: Likewise.
	* posix/getopt.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.
	* posix/wordexp.c: Likewise.
	* io/ftw.c: Likewise.
	* io/fts.c: Likewise.
	* misc/getpass.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* argp/argp-fmtstream.c: Likewise.
	* argp/argp-help.c: Likewise.
	* elf/dl-load.c: Likewise.
	* locale/programs/stringtrans.c: Likewise.
	* catgets/gencat.c: Likewise.
	* posix/getconf.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/iconv_prog.c: Likewise.

	* string/strcoll.c: Optimize a few expressions.
	* string/strxfrm.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-open.c (dl_open_worker): Move decl of new_global up one
	level to avoid uninit variable warning.

1998-09-09 10:34  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	instead of _dl_default_scope[2] as argument to _dl_init_next.
	Fix compatibility problems introduced in last change.
1998-09-09 11:53:19 +00:00

143 lines
3.2 KiB
C

/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
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 <assert.h>
#include <stdlib.h>
#include "charset.h"
#include "stringtrans.h"
/* Global variable. */
enum encoding_method encoding_method = ENC_UCS4;
void *xmalloc (size_t __n);
void *xrealloc (void *__p, size_t __n);
#define ADDC(ch) \
do \
{ \
char *cp; \
if (bufact + (encoding_method == ENC_UCS4 ? 4 : 1) >= bufmax) \
{ \
bufmax *= 2; \
buf = xrealloc (buf, bufmax); \
} \
cp = &buf[bufact]; \
if (encode_char (ch, &cp) < 0) \
{ \
free (buf); \
return NULL; \
} \
bufact = cp - buf; \
} \
while (0)
char *
translate_string (char *str, struct charset_t *charset)
{
char *buf;
size_t bufact = 0;
size_t bufmax = 56;
buf = (char *) xmalloc (bufmax);
while (str[0] != '\0')
{
char *tp;
unsigned int value;
if (str[0] != '<')
{
ADDC (*str++);
continue;
}
tp = &str[1];
while (tp[0] != '\0' && tp[0] != '>')
if (tp[0] == '\\' && tp[1] != '\0')
tp += 2;
else
++tp;
if (tp[0] == '\0')
{
free (buf);
return NULL;
}
value = charset_find_value (&charset->char_table, str + 1,
tp - (str + 1));
if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
{
free (buf);
return NULL;
}
else
/* Encode string using current method. */
ADDC (value);
str = &tp[1];
}
ADDC ('\0');
return buf;
}
int
encode_char (unsigned int value, char **cpp)
{
switch (encoding_method)
{
case ENC_UCS1:
if (value > 255)
return -1;
*(*cpp)++ = (char) value;
break;
case ENC_UCS4:
#if __BYTE_ORDER == __BIG_ENDIAN
*(*cpp)++ = (char) (value >> 24);
*(*cpp)++ = (char) ((value >> 16) & 0xff);
*(*cpp)++ = (char) ((value >> 8) & 0xff);
*(*cpp)++ = (char) (value & 0xff);
#else
*(*cpp)++ = (char) (value & 0xff);
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
#endif
break;
default:
return -1;
}
return 0;
}