Module Name: src
Committed By: joerg
Date: Fri Jan 20 16:31:30 UTC 2012
Modified Files:
src/lib/libc: Makefile Makefile.inc
src/lib/libc/iconv: Makefile.inc iconv.c
src/lib/libc/locale: Makefile.inc global_locale.c rune.c setlocale.c
src/lib/libc/nls: Makefile.inc catopen.c
src/usr.bin/locale: Makefile locale.c
Removed Files:
src/lib/libc/locale: aliasname.c bsdctype.c bsdctype_file.h
bsdctype_local.h iswctype_sb.c localeio.c localeio_lc_ctype.c
localeio_lc_messages.c localeio_lc_monetary.c localeio_lc_numeric.c
localeio_lc_time.c multibyte_sb.c
Log Message:
Remove code for CITRUS!=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/lib/libc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/iconv/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/iconv/iconv.c
cvs rdiff -u -r1.59 -r1.60 src/lib/libc/locale/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/lib/libc/locale/aliasname.c
cvs rdiff -u -r1.10 -r0 src/lib/libc/locale/bsdctype.c
cvs rdiff -u -r1.2 -r0 src/lib/libc/locale/bsdctype_file.h \
src/lib/libc/locale/bsdctype_local.h \
src/lib/libc/locale/localeio_lc_messages.c \
src/lib/libc/locale/localeio_lc_monetary.c \
src/lib/libc/locale/localeio_lc_numeric.c \
src/lib/libc/locale/localeio_lc_time.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.11 -r0 src/lib/libc/locale/iswctype_sb.c
cvs rdiff -u -r1.6 -r0 src/lib/libc/locale/localeio.c \
src/lib/libc/locale/localeio_lc_ctype.c
cvs rdiff -u -r1.5 -r0 src/lib/libc/locale/multibyte_sb.c
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/locale/rune.c
cvs rdiff -u -r1.58 -r1.59 src/lib/libc/locale/setlocale.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/nls/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/nls/catopen.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/locale/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/locale/locale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.148 src/lib/libc/Makefile:1.149
--- src/lib/libc/Makefile:1.148 Wed Aug 17 09:53:53 2011
+++ src/lib/libc/Makefile Fri Jan 20 16:31:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2011/08/17 09:53:53 christos Exp $
+# $NetBSD: Makefile,v 1.149 2012/01/20 16:31:29 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -57,9 +57,7 @@ COMPATDIR=${.CURDIR}/compat
.include "${.CURDIR}/atomic/Makefile.inc"
.include "${.CURDIR}/cdb/Makefile.inc"
.include "${.CURDIR}/db/Makefile.inc"
-.if (${CITRUS} == "yes")
.include "${.CURDIR}/citrus/Makefile.inc"
-.endif
.include "${.CURDIR}/compat-43/Makefile.inc"
.include "${.CURDIR}/dlfcn/Makefile.inc"
.include "${.CURDIR}/gdtoa/Makefile.inc"
@@ -138,9 +136,7 @@ FILESDIR= /var/db
# workaround for I18N stuffs: build singlebyte setlocale() for libc.a,
# multibyte for libc.so. the quirk should be removed when we support
# dlopen() from within statically linked binaries.
-.if (${CITRUS} == "yes")
CSHLIBFLAGS+= -D_I18N_DYNAMIC
-.endif
.include <bsd.lib.mk>
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.7 src/lib/libc/Makefile.inc:1.8
--- src/lib/libc/Makefile.inc:1.7 Thu Nov 10 00:36:54 2011
+++ src/lib/libc/Makefile.inc Fri Jan 20 16:31:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/11/10 00:36:54 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2012/01/20 16:31:29 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -21,8 +21,6 @@ USE_FORT?= yes
USE_SHLIBDIR= yes
-CITRUS?= yes
-
.include <bsd.own.mk>
WARNS=4
Index: src/lib/libc/iconv/Makefile.inc
diff -u src/lib/libc/iconv/Makefile.inc:1.4 src/lib/libc/iconv/Makefile.inc:1.5
--- src/lib/libc/iconv/Makefile.inc:1.4 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/iconv/Makefile.inc Fri Jan 20 16:31:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/01/11 02:46:28 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/01/20 16:31:29 joerg Exp $
.PATH: ${ARCHDIR}/iconv ${.CURDIR}/iconv
@@ -6,8 +6,4 @@ SRCS+= iconv.c
MAN+= iconv.3
MLINKS+=iconv.3 iconv_open.3 iconv.3 iconv_close.3
-.if ${CITRUS} == "yes"
-CPPFLAGS.iconv.c+= -DHAVE_CITRUS -I${LIBCDIR}/citrus
-.else
-CPPFLAGS.iconv.c+= -UHAVE_CITRUS
-.endif
+CPPFLAGS.iconv.c+= -I${LIBCDIR}/citrus
Index: src/lib/libc/iconv/iconv.c
diff -u src/lib/libc/iconv/iconv.c:1.12 src/lib/libc/iconv/iconv.c:1.13
--- src/lib/libc/iconv/iconv.c:1.12 Wed Aug 5 15:17:02 2009
+++ src/lib/libc/iconv/iconv.c Fri Jan 20 16:31:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $ */
+/* $NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $");
+__RCSID("$NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -45,7 +45,6 @@ __weak_alias(iconv_open, _iconv_open)
__weak_alias(iconv_close, _iconv_close)
#endif
-#ifdef HAVE_CITRUS
#include <sys/types.h>
#include "citrus_types.h"
#include "citrus_module.h"
@@ -150,39 +149,3 @@ __iconv_free_list(char **list, size_t sz
{
_citrus_esdb_free_list(list, sz);
}
-
-#else
-iconv_t
-/*ARGSUSED*/
-iconv_open(const char *in, const char *out)
-{
- errno = EINVAL;
- return ((iconv_t)-1);
-}
-int
-/*ARGSUSED*/
-iconv_close(iconv_t handle)
-{
- errno = EBADF;
- return (-1);
-}
-size_t
-/*ARGSUSED*/
-iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
-{
- errno = EBADF;
- return ((size_t)-1);
-}
-int
-/*ARGSUSED*/
-__iconv_get_list(char ***rlist, size_t *rsz)
-{
- errno = EINVAL;
- return -1;
-}
-void
-/*ARGSUSED*/
-__iconv_free_list(char **list, size_t sz)
-{
-}
-#endif
Index: src/lib/libc/locale/Makefile.inc
diff -u src/lib/libc/locale/Makefile.inc:1.59 src/lib/libc/locale/Makefile.inc:1.60
--- src/lib/libc/locale/Makefile.inc:1.59 Sun Aug 14 09:07:37 2011
+++ src/lib/libc/locale/Makefile.inc Fri Jan 20 16:31:29 2012
@@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 5.1 (Berkeley) 2/18/91
-# $NetBSD: Makefile.inc,v 1.59 2011/08/14 09:07:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.60 2012/01/20 16:31:29 joerg Exp $
# locale sources
.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
@@ -12,7 +12,6 @@ SRCS+= _def_messages.c _def_monetary.c _
wcstol.c wcstoll.c wcstoimax.c wcstoul.c wcstoull.c wcstoumax.c \
wcstod.c wcstof.c wcstold.c wcscoll.c wcsxfrm.c wcsftime.c
-.if (${CITRUS} == "yes")
# citrus multibyte locale support
# we have quirk for libc.a - see the last part of lib/libc/Makefile
CPPFLAGS+= -DWITH_RUNE -I${.CURDIR}
@@ -22,14 +21,6 @@ CPPFLAGS.rune.c+= -I${LIBCDIR}/citrus
CPPFLAGS.runetable.c+= -I${LIBCDIR}/citrus
CPPFLAGS.multibyte_c90.c+= -I${LIBCDIR}/citrus
CPPFLAGS.multibyte_amd1.c+= -I${LIBCDIR}/citrus
-.else
-# singlebyte locale - dummy
-CPPFLAGS+= -UWITH_RUNE
-SRCS+= aliasname.c bsdctype.c localeio.c \
- multibyte_sb.c iswctype_sb.c \
- localeio_lc_ctype.c localeio_lc_monetary.c \
- localeio_lc_numeric.c localeio_lc_time.c localeio_lc_messages.c
-.endif
MAN+= setlocale.3 nl_langinfo.3
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.11 src/lib/libc/locale/global_locale.c:1.12
--- src/lib/libc/locale/global_locale.c:1.11 Sat Jun 19 13:26:52 2010
+++ src/lib/libc/locale/global_locale.c Fri Jan 20 16:31:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.11 2010/06/19 13:26:52 tnozaki Exp $ */
+/* $NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.11 2010/06/19 13:26:52 tnozaki Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -39,12 +39,8 @@ __RCSID("$NetBSD: global_locale.c,v 1.11
#define __SETLOCALE_SOURCE__
#include <locale.h>
#include <stdlib.h>
-#ifdef WITH_RUNE
-#include "runetype_local.h"
-#else
-#include "bsdctype_local.h"
-#endif
+#include "runetype_local.h"
#include "setlocale_local.h"
static struct lconv _global_ldata = {
@@ -159,11 +155,7 @@ struct _locale_impl_t _global_locale = {
[(size_t)LC_ALL ] = (_locale_part_t)NULL,
[(size_t)LC_COLLATE ] = (_locale_part_t)NULL,
[(size_t)LC_CTYPE ] = (_locale_part_t)
-#ifdef WITH_RUNE
__UNCONST(&_DefaultRuneLocale),
-#else
- __UNCONST(&_DefaultBSDCTypeLocale),
-#endif
[(size_t)LC_MONETARY] = (_locale_part_t)
__UNCONST(&_DefaultMonetaryLocale),
[(size_t)LC_NUMERIC ] = (_locale_part_t)
Index: src/lib/libc/locale/rune.c
diff -u src/lib/libc/locale/rune.c:1.42 src/lib/libc/locale/rune.c:1.43
--- src/lib/libc/locale/rune.c:1.42 Fri Mar 25 00:45:24 2011
+++ src/lib/libc/locale/rune.c Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rune.c,v 1.42 2011/03/25 00:45:24 joerg Exp $ */
+/* $NetBSD: rune.c,v 1.43 2012/01/20 16:31:30 joerg Exp $ */
/*-
* Copyright (c)2010 Citrus Project,
@@ -47,7 +47,6 @@
#include "citrus_ctype.h"
#include "runetype_local.h"
-#include "bsdctype_local.h"
#include "multibyte.h"
Index: src/lib/libc/locale/setlocale.c
diff -u src/lib/libc/locale/setlocale.c:1.58 src/lib/libc/locale/setlocale.c:1.59
--- src/lib/libc/locale/setlocale.c:1.58 Mon Jun 7 13:52:30 2010
+++ src/lib/libc/locale/setlocale.c Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale.c,v 1.58 2010/06/07 13:52:30 tnozaki Exp $ */
+/* $NetBSD: setlocale.c,v 1.59 2012/01/20 16:31:30 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale.c,v 1.58 2010/06/07 13:52:30 tnozaki Exp $");
+__RCSID("$NetBSD: setlocale.c,v 1.59 2012/01/20 16:31:30 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -47,35 +47,19 @@ __link_set_decl(all_categories, _locale_
extern const _locale_category_t _generic_LC_ALL_desc;
extern const _locale_category_t _dummy_LC_COLLATE_desc;
-#ifdef WITH_RUNE
extern const _locale_category_t _citrus_LC_CTYPE_desc;
extern const _locale_category_t _citrus_LC_MONETARY_desc;
extern const _locale_category_t _citrus_LC_NUMERIC_desc;
extern const _locale_category_t _citrus_LC_TIME_desc;
extern const _locale_category_t _citrus_LC_MESSAGES_desc;
-#else
-extern const _locale_category_t _localeio_LC_CTYPE_desc;
-extern const _locale_category_t _localeio_LC_MONETARY_desc;
-extern const _locale_category_t _localeio_LC_NUMERIC_desc;
-extern const _locale_category_t _localeio_LC_TIME_desc;
-extern const _locale_category_t _localeio_LC_MESSAGES_desc;
-#endif
__link_set_add_data(all_categories, _generic_LC_ALL_desc);
__link_set_add_data(all_categories, _dummy_LC_COLLATE_desc);
-#ifdef WITH_RUNE
__link_set_add_data(all_categories, _citrus_LC_CTYPE_desc);
__link_set_add_data(all_categories, _citrus_LC_MONETARY_desc);
__link_set_add_data(all_categories, _citrus_LC_NUMERIC_desc);
__link_set_add_data(all_categories, _citrus_LC_TIME_desc);
__link_set_add_data(all_categories, _citrus_LC_MESSAGES_desc);
-#else
-__link_set_add_data(all_categories, _localeio_LC_CTYPE_desc);
-__link_set_add_data(all_categories, _localeio_LC_MONETARY_desc);
-__link_set_add_data(all_categories, _localeio_LC_NUMERIC_desc);
-__link_set_add_data(all_categories, _localeio_LC_TIME_desc);
-__link_set_add_data(all_categories, _localeio_LC_MESSAGES_desc);
-#endif
_locale_category_t *
_find_category(int category)
Index: src/lib/libc/nls/Makefile.inc
diff -u src/lib/libc/nls/Makefile.inc:1.10 src/lib/libc/nls/Makefile.inc:1.11
--- src/lib/libc/nls/Makefile.inc:1.10 Sun Jan 11 02:46:29 2009
+++ src/lib/libc/nls/Makefile.inc Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2009/01/11 02:46:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2012/01/20 16:31:30 joerg Exp $
.PATH: ${.CURDIR}/nls
@@ -8,9 +8,5 @@ MAN+= catclose.3 catgets.3 catopen.3
# indirect reference stubs, to be removed soon.
SRCS+= _catclose.c _catgets.c _catopen.c
-.if ${CITRUS} == "yes"
-CPPFLAGS.catopen.c+= -DHAVE_CITRUS -I${LIBCDIR}/citrus
-.else
-CPPFLAGS.catopen.c+= -UHAVE_CITRUS -I${LIBCDIR}/locale
-.endif
+CPPFLAGS.catopen.c+= -I${LIBCDIR}/citrus
Index: src/lib/libc/nls/catopen.c
diff -u src/lib/libc/nls/catopen.c:1.28 src/lib/libc/nls/catopen.c:1.29
--- src/lib/libc/nls/catopen.c:1.28 Tue Mar 10 13:15:40 2009
+++ src/lib/libc/nls/catopen.c Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: catopen.c,v 1.28 2009/03/10 13:15:40 joerg Exp $ */
+/* $NetBSD: catopen.c,v 1.29 2012/01/20 16:31:30 joerg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: catopen.c,v 1.28 2009/03/10 13:15:40 joerg Exp $");
+__RCSID("$NetBSD: catopen.c,v 1.29 2012/01/20 16:31:30 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#define _NLS_PRIVATE
@@ -50,15 +50,11 @@ __RCSID("$NetBSD: catopen.c,v 1.28 2009/
#include <string.h>
#include <unistd.h>
-#ifdef HAVE_CITRUS
#include "citrus_namespace.h"
#include "citrus_bcs.h"
#include "citrus_region.h"
#include "citrus_lookup.h"
#include "citrus_aliasname_local.h"
-#else
-#include "aliasname_local.h"
-#endif
#define NLS_ALIAS_DB "/usr/share/nls/nls.alias"
Index: src/usr.bin/locale/Makefile
diff -u src/usr.bin/locale/Makefile:1.3 src/usr.bin/locale/Makefile:1.4
--- src/usr.bin/locale/Makefile:1.3 Tue Apr 14 22:15:22 2009
+++ src/usr.bin/locale/Makefile Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/14 22:15:22 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/20 16:31:30 joerg Exp $
# FreeBSD: src/usr.bin/locale/Makefile,v 1.4 2003/06/25 23:05:11 phantom Exp
WARNS?= 2 # XXX -Wcast-qual issues
@@ -6,9 +6,6 @@ WARNS?= 2 # XXX -Wcast-qual issues
PROG = locale
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/locale
-CITRUS?= yes
-.if ${CITRUS} == "yes"
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/citrus -DCITRUS
-.endif
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/citrus
.include <bsd.prog.mk>
Index: src/usr.bin/locale/locale.c
diff -u src/usr.bin/locale/locale.c:1.7 src/usr.bin/locale/locale.c:1.8
--- src/usr.bin/locale/locale.c:1.7 Fri Jan 16 13:30:07 2009
+++ src/usr.bin/locale/locale.c Fri Jan 20 16:31:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locale.c,v 1.7 2009/01/16 13:30:07 hira Exp $ */
+/* $NetBSD: locale.c,v 1.8 2012/01/20 16:31:30 joerg Exp $ */
/*-
* Copyright (c) 2002, 2003 Alexey Zelkin <[email protected]>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: locale.c,v 1.7 2009/01/16 13:30:07 hira Exp $");
+__RCSID("$NetBSD: locale.c,v 1.8 2012/01/20 16:31:30 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
/*
@@ -56,11 +56,9 @@ __RCSID("$NetBSD: locale.c,v 1.7 2009/01
#include <stringlist.h>
#include <unistd.h>
-#ifdef CITRUS
#include "citrus_namespace.h"
#include "citrus_region.h"
#include "citrus_lookup.h"
-#endif
#include "setlocale_local.h"
/* Local prototypes */
@@ -443,12 +441,8 @@ void
init_locales_list_alias(void)
{
char aliaspath[PATH_MAX];
-#ifdef CITRUS
struct _lookup *hlookup;
struct _region key, dat;
-#else
- FILE *fp;
-#endif
size_t n;
char *s, *t;
@@ -458,23 +452,12 @@ init_locales_list_alias(void)
(void)snprintf(aliaspath, sizeof(aliaspath),
"%s/" _LOCALE_ALIAS_NAME, _PathLocale);
-#ifdef CITRUS
if (_lookup_seq_open(&hlookup, aliaspath,
_LOOKUP_CASE_SENSITIVE) == 0) {
while (_lookup_seq_next(hlookup, &key, &dat) == 0) {
n = _region_size((const struct _region *)&key);
s = _region_head((const struct _region *)&key);
for (t = s; n > 0 && *s!= '/'; --n, ++s);
-#else
- fp = fopen(aliaspath, "r");
- if (fp != NULL) {
- while ((s = fgetln(fp, &n)) != NULL) {
- _DIAGASSERT(n > 0);
- if (*s == '#' || *s == '\n')
- continue;
- for (t = s; n > 0 && strchr("/ \t\n", *s) == NULL;
- --n, ++s);
-#endif
n = (size_t)(s - t);
s = malloc(n + 1);
if (s == NULL)
@@ -486,11 +469,7 @@ init_locales_list_alias(void)
else
free(s);
}
-#ifdef CITRUS
_lookup_seq_close(hlookup);
-#else
- fclose(fp);
-#endif
}
}
