[uClibc-cvs] uClibc/libc/misc/intl Makefile, NONE, 1.1 intl.c, NONE, 1.1
Manuel Novoa III
mjn3 at uclibc.org
Fri Aug 1 20:09:16 UTC 2003
Update of /var/cvs/uClibc/libc/misc/intl
In directory winder:/tmp/cvs-serv28208/libc/misc/intl
Added Files:
Makefile intl.c
Log Message:
Add a new *scanf implementation, includeing the *wscanf functions.
Should be standards compliant and with several optional features,
including support for hexadecimal float notation, locale awareness,
glibc-like locale-specific digit grouping with the `'' flag, and
positional arg support. I tested it pretty well (finding several
bugs in glibc's scanf in the process), but it is brand new so be
aware.
The *wprintf functions now support floating point output. Also, a
couple of bugs were squashed. Finally, %a/%A conversions are
now implemented.
Implement the glibc xlocale interface for thread-specific locale
support. Also add the various *_l(args, locale_t loc_arg) funcs.
NOTE!!! setlocale() is NOT threadsafe! NOTE!!!
The strto{floating point} conversion functions are now locale aware.
The also now support hexadecimal floating point notation.
Add the wcsto{floating point} conversion functions.
Fix a bug in mktime() related to dst. Note that unlike glibc's mktime,
uClibc's version always normalizes the struct tm before attempting
to determine the correct dst setting if tm_isdst == -1 on entry.
Add a stub version of the libintl functions. (untested)
Fixed a known memory leak in setlocale() related to the collation data.
Add lots of new config options (which Erik agreed to sort out :-),
including finally exposing some of the stripped down stdio configs.
Be careful with those though, as they haven't been tested in a
long time.
(temporary) GOTCHAs...
The ctype functions are currently incorrect for 8-bit locales. They
will be fixed shortly.
The ctype functions are now table-based, resulting in larger staticly
linked binaries. I'll be adding an option to use the old approach
in the stub locale configuration.
--- NEW FILE: Makefile ---
# Makefile for uClibc
#
# Copyright (C) 2000 by Lineo, inc.
# Copyright (C) 2000,2001 Erik Andersen <andersen at uclibc.org>
#
# This program 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 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 this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Derived in part from the Linux-8086 C library, the GNU C Library, and several
# other sundry sources. Files within this library are copyright by their
# respective copyright holders.
TOPDIR=../../../
include $(TOPDIR)Rules.mak
MSRC= intl.c
MOBJ= gettext.o ngettext.o dgettext.o dcgettext.o dngettext.o dcngettext.o \
textdomain.o bindtextdomain.o bind_textdomain_codeset.o
OBJS=$(MOBJ)
all: $(OBJS) $(LIBC)
$(LIBC): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
$(MOBJ): $(MSRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(STRIPTOOL) -x -R .note -R .comment $*.o
$(COBJS): %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
rm -f *.[oa] *~ core
--- NEW FILE: intl.c ---
/* Copyright (C) 2003 Manuel Novoa III
*
* This 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 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 this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/*
* Supply some weaks for gettext and friends. Used by strerror*().
*/
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#undef __OPTIMIZE__
#include <libintl.h>
/**********************************************************************/
#ifdef L_gettext
char *weak_function gettext(const char *msgid)
{
return (char *) msgid;
}
#endif
/**********************************************************************/
#ifdef L_dgettext
char *__uClibc_dgettext(const char *domainname,
const char *msgid)
{
return (char *) msgid;
}
weak_alias (__uClibc_dgettext, __dgettext)
weak_alias (__uClibc_dgettext, dgettext)
#endif
/**********************************************************************/
#ifdef L_dcgettext
char * __uClibc_dcgettext(const char *domainname,
const char *msgid, int category)
{
return (char *) msgid;
}
weak_alias (__uClibc_dcgettext, __dcgettext)
weak_alias (__uClibc_dcgettext, dcgettext)
#endif
/**********************************************************************/
#ifdef L_ngettext
char *weak_function ngettext(const char *msgid1, const char *msgid2,
unsigned long int n)
{
return (char *) ((n == 1) ? msgid1 : msgid2);
}
#endif
/**********************************************************************/
#ifdef L_dngettext
char *weak_function dngettext(const char *domainname, const char *msgid1,
const char *msgid2, unsigned long int n)
{
return (char *) ((n == 1) ? msgid1 : msgid2);
}
#endif
/**********************************************************************/
#ifdef L_dcngettext
char *weak_function dcngettext(const char *domainname, const char *msgid1,
const char *msgid2, unsigned long int n,
int category)
{
return (char *) ((n == 1) ? msgid1 : msgid2);
}
#endif
/**********************************************************************/
#ifdef L_textdomain
char *weak_function textdomain(const char *domainname)
{
static const char default_str[] = "messages";
if (domainname && *domainname && strcmp(domainname, default_str)) {
__set_errno(EINVAL);
return NULL;
}
return (char *) default_str;
}
#endif
/**********************************************************************/
#ifdef L_bindtextdomain
char *weak_function bindtextdomain(const char *domainname, const char *dirname)
{
static const char dir[] = "/";
if (!domainname || !*domainname
|| (dirname
#if 1
&& ((dirname[0] != '/') || dirname[1])
#else
&& strcmp(dirname, dir)
#endif
)
) {
__set_errno(EINVAL);
return NULL;
}
return (char *) dir;
}
#endif
/**********************************************************************/
#ifdef L_bind_textdomain_codeset
/* Specify the character encoding in which the messages from the
DOMAINNAME message catalog will be returned. */
char *weak_function bind_textdomain_codeset(const char *domainname,
const char *codeset)
{
if (!domainname || !*domainname || codeset) {
__set_errno(EINVAL);
}
return NULL;
}
#endif
/**********************************************************************/
More information about the uClibc-cvs
mailing list