Module Name: src
Committed By: tnozaki
Date: Sat May 22 07:18:44 UTC 2010
Modified Files:
src/lib/libc/locale: _wctrans.c _wctype.c global_locale.c iswctype_mb.c
multibyte_amd1.c multibyte_c90.c rune.c rune_local.h runeglue.c
runetable.c setlocale1.c setlocale32.c
src/usr.bin/mklocale: ldef.h
Removed Files:
src/lib/libc/locale: rune.h
Log Message:
include ctype_local.h
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/locale/_wctrans.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/_wctype.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/locale/global_locale.c \
src/lib/libc/locale/iswctype_mb.c src/lib/libc/locale/multibyte_c90.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/locale/multibyte_amd1.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/locale/rune.c
cvs rdiff -u -r1.18 -r0 src/lib/libc/locale/rune.h
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/locale/rune_local.h
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/locale/runeglue.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/locale/runetable.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/setlocale1.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/locale/setlocale32.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/mklocale/ldef.h
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/locale/_wctrans.c
diff -u src/lib/libc/locale/_wctrans.c:1.13 src/lib/libc/locale/_wctrans.c:1.14
--- src/lib/libc/locale/_wctrans.c:1.13 Sun Jan 18 22:03:19 2009
+++ src/lib/libc/locale/_wctrans.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: _wctrans.c,v 1.13 2009/01/18 22:03:19 tnozaki Exp $ */
+/* $NetBSD: _wctrans.c,v 1.14 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctrans.c,v 1.13 2009/01/18 22:03:19 tnozaki Exp $");
+__RCSID("$NetBSD: _wctrans.c,v 1.14 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -69,7 +69,6 @@
#include <wctype.h>
#include <stdlib.h>
#include <string.h>
-#include "rune.h"
#include "rune_local.h"
#include "_wctrans_local.h"
Index: src/lib/libc/locale/_wctype.c
diff -u src/lib/libc/locale/_wctype.c:1.5 src/lib/libc/locale/_wctype.c:1.6
--- src/lib/libc/locale/_wctype.c:1.5 Sun Jan 18 22:03:19 2009
+++ src/lib/libc/locale/_wctype.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: _wctype.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $ */
+/* $NetBSD: _wctype.c,v 1.6 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctype.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $");
+__RCSID("$NetBSD: _wctype.c,v 1.6 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -68,7 +68,7 @@
#include <errno.h>
#include <string.h>
-#include "rune.h"
+#include "rune_local.h"
#include "_wctrans_local.h"
#include "_wctype_local.h"
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.6 src/lib/libc/locale/global_locale.c:1.7
--- src/lib/libc/locale/global_locale.c:1.6 Sat May 22 06:38:15 2010
+++ src/lib/libc/locale/global_locale.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.6 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: global_locale.c,v 1.7 2010/05/22 07:18:43 tnozaki 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.6 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -40,7 +40,7 @@
#include <locale.h>
#include <stdlib.h>
#ifdef WITH_RUNE
-#include "rune.h"
+#include "rune_local.h"
#else
#include "bsdctype.h"
#endif
Index: src/lib/libc/locale/iswctype_mb.c
diff -u src/lib/libc/locale/iswctype_mb.c:1.6 src/lib/libc/locale/iswctype_mb.c:1.7
--- src/lib/libc/locale/iswctype_mb.c:1.6 Sat Mar 27 22:14:09 2010
+++ src/lib/libc/locale/iswctype_mb.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $ */
+/* $NetBSD: iswctype_mb.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $");
+__RCSID("$NetBSD: iswctype_mb.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -45,7 +45,7 @@
#include "setlocale_local.h"
-#include "rune.h"
+#include "rune_local.h"
#include "_wctype_local.h"
#include "_wctrans_local.h"
Index: src/lib/libc/locale/multibyte_c90.c
diff -u src/lib/libc/locale/multibyte_c90.c:1.6 src/lib/libc/locale/multibyte_c90.c:1.7
--- src/lib/libc/locale/multibyte_c90.c:1.6 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/locale/multibyte_c90.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte_c90.c,v 1.6 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: multibyte_c90.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)2002, 2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_c90.c,v 1.6 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: multibyte_c90.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -44,7 +44,7 @@
#include "citrus_module.h"
#include "citrus_ctype.h"
-#include "rune.h"
+#include "rune_local.h"
#define _RUNE_LOCALE() \
((_RuneLocale *)(*_current_locale())->part_impl[(size_t)LC_CTYPE])
Index: src/lib/libc/locale/multibyte_amd1.c
diff -u src/lib/libc/locale/multibyte_amd1.c:1.7 src/lib/libc/locale/multibyte_amd1.c:1.8
--- src/lib/libc/locale/multibyte_amd1.c:1.7 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/locale/multibyte_amd1.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: multibyte_amd1.c,v 1.8 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)2002, 2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: multibyte_amd1.c,v 1.8 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -43,7 +43,7 @@
#include "citrus_module.h"
#include "citrus_ctype.h"
-#include "rune.h"
+#include "rune_local.h"
#include "multibyte.h"
#define _RUNE_LOCALE() \
Index: src/lib/libc/locale/rune.c
diff -u src/lib/libc/locale/rune.c:1.34 src/lib/libc/locale/rune.c:1.35
--- src/lib/libc/locale/rune.c:1.34 Sat May 22 06:38:15 2010
+++ src/lib/libc/locale/rune.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rune.c,v 1.34 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: rune.c,v 1.35 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rune.c,v 1.34 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: rune.c,v 1.35 2010/05/22 07:18:43 tnozaki Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,7 +81,6 @@
#include "citrus_ctype.h"
#include "bsdctype.h"
-#include "rune.h"
#include "rune_local.h"
static int readrange __P((_RuneLocale *, _RuneRange *, _FileRuneRange *, void *, FILE *));
Index: src/lib/libc/locale/rune_local.h
diff -u src/lib/libc/locale/rune_local.h:1.12 src/lib/libc/locale/rune_local.h:1.13
--- src/lib/libc/locale/rune_local.h:1.12 Sun Jan 11 02:46:29 2009
+++ src/lib/libc/locale/rune_local.h Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rune_local.h,v 1.12 2009/01/11 02:46:29 christos Exp $ */
+/* $NetBSD: rune_local.h,v 1.13 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c) 2000 Citrus Project,
@@ -26,9 +26,97 @@
* SUCH DAMAGE.
*/
+/*-
+ * Copyright (c) 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)rune.h 8.1 (Berkeley) 6/27/93
+ * NetBSD: rune.h,v 1.17 2009/01/18 22:03:19 tnozaki Exp
+ */
+
#ifndef _RUNE_LOCAL_H_
#define _RUNE_LOCAL_H_
+#include <stdio.h>
+#include <wchar.h>
+#include "runetype_local.h"
+
+/*
+ * map _RTYPE_x to _CTYPE_x
+ *
+ * XXX: these should be defined in ctype.h and used in isxxx macros.
+ * (note: current isxxx macros use "old" NetBSD masks and
+ * _CTYPE_x are not public.)
+ */
+#define _CTYPE_A _RUNETYPE_A
+#define _CTYPE_C _RUNETYPE_C
+#define _CTYPE_D _RUNETYPE_D
+#define _CTYPE_G _RUNETYPE_G
+#define _CTYPE_L _RUNETYPE_L
+#define _CTYPE_P _RUNETYPE_P
+#define _CTYPE_S _RUNETYPE_S
+#define _CTYPE_U _RUNETYPE_U
+#define _CTYPE_X _RUNETYPE_X
+#define _CTYPE_B _RUNETYPE_B
+#define _CTYPE_R _RUNETYPE_R
+#define _CTYPE_I _RUNETYPE_I
+#define _CTYPE_T _RUNETYPE_T
+#define _CTYPE_Q _RUNETYPE_Q
+#define _CTYPE_SWM _RUNETYPE_SWM
+#define _CTYPE_SWS _RUNETYPE_SWS
+#define _CTYPE_SW0 _RUNETYPE_SW0
+#define _CTYPE_SW1 _RUNETYPE_SW1
+#define _CTYPE_SW2 _RUNETYPE_SW2
+#define _CTYPE_SW3 _RUNETYPE_SW3
+
+/*
+ * Other namespace conversion.
+ */
+#define _RUNE_ISCACHED _NB_RUNE_ISCACHED
+#define _DEFAULT_INVALID_RUNE _NB_DEFAULT_INVALID_RUNE
+#define _RuneEntry _NBRuneEntry
+#define _RuneRange _NBRuneRange
+#define _RuneLocale _NBRuneLocale
+#define _RUNE_MAGIC_1 _NB_RUNE_MAGIC_1
+#define _RUNE_MODULE_1 _NB_RUNE_MODULE_1
+#define _RUNE_CODESET _NB_RUNE_CODESET
+
+/*
+ * global variables
+ */
+extern size_t __mb_len_max_runtime;
+#define __MB_LEN_MAX_RUNTIME __mb_len_max_runtime
+
+extern const _RuneLocale _DefaultRuneLocale;
+extern const _RuneLocale *_CurrentRuneLocale;
+
/* rune.c */
extern _RuneLocale *_Read_RuneMagi(FILE *fp);
extern _RuneLocale *_Read_CTypeAsRune(FILE *fp);
@@ -37,4 +125,4 @@
/* runeglue.c */
extern int __runetable_to_netbsd_ctype(_RuneLocale *);
-#endif
+#endif /*! _RUNE_LOCAL_H_ */
Index: src/lib/libc/locale/runeglue.c
diff -u src/lib/libc/locale/runeglue.c:1.16 src/lib/libc/locale/runeglue.c:1.17
--- src/lib/libc/locale/runeglue.c:1.16 Sat May 22 06:38:15 2010
+++ src/lib/libc/locale/runeglue.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: runeglue.c,v 1.16 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: runeglue.c,v 1.17 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: runeglue.c,v 1.16 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: runeglue.c,v 1.17 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -50,7 +50,6 @@
#include "citrus_module.h"
#include "citrus_ctype.h"
-#include "rune.h"
#include "rune_local.h"
#if EOF != -1
Index: src/lib/libc/locale/runetable.c
diff -u src/lib/libc/locale/runetable.c:1.22 src/lib/libc/locale/runetable.c:1.23
--- src/lib/libc/locale/runetable.c:1.22 Sat May 22 06:38:15 2010
+++ src/lib/libc/locale/runetable.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: runetable.c,v 1.22 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: runetable.c,v 1.23 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93";
#else
-__RCSID("$NetBSD: runetable.c,v 1.22 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: runetable.c,v 1.23 2010/05/22 07:18:43 tnozaki Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -52,7 +52,6 @@
#include "citrus_module.h"
#include "citrus_ctype.h"
-#include "rune.h"
#include "rune_local.h"
const _RuneLocale _DefaultRuneLocale = {
Index: src/lib/libc/locale/setlocale1.c
diff -u src/lib/libc/locale/setlocale1.c:1.2 src/lib/libc/locale/setlocale1.c:1.3
--- src/lib/libc/locale/setlocale1.c:1.2 Tue Mar 11 17:23:07 2003
+++ src/lib/libc/locale/setlocale1.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale1.c,v 1.2 2003/03/11 17:23:07 tshiozak Exp $ */
+/* $NetBSD: setlocale1.c,v 1.3 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -28,13 +28,13 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale1.c,v 1.2 2003/03/11 17:23:07 tshiozak Exp $");
+__RCSID("$NetBSD: setlocale1.c,v 1.3 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#define __SETLOCALE_SOURCE__
#include <locale.h>
-#include "rune.h"
+#include "rune_local.h"
__warn_references(setlocale,
"warning: reference to compatibility setlocale(); include <locale.h> for correct reference")
Index: src/lib/libc/locale/setlocale32.c
diff -u src/lib/libc/locale/setlocale32.c:1.4 src/lib/libc/locale/setlocale32.c:1.5
--- src/lib/libc/locale/setlocale32.c:1.4 Sun Mar 28 18:19:52 2010
+++ src/lib/libc/locale/setlocale32.c Sat May 22 07:18:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale32.c,v 1.4 2010/03/28 18:19:52 tnozaki Exp $ */
+/* $NetBSD: setlocale32.c,v 1.5 2010/05/22 07:18:43 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -28,14 +28,14 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale32.c,v 1.4 2010/03/28 18:19:52 tnozaki Exp $");
+__RCSID("$NetBSD: setlocale32.c,v 1.5 2010/05/22 07:18:43 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#define __SETLOCALE_SOURCE__
#include <locale.h>
#include <limits.h>
-#include "rune.h"
+#include "rune_local.h"
char *
__setlocale_mb_len_max_32(category, locale)
Index: src/usr.bin/mklocale/ldef.h
diff -u src/usr.bin/mklocale/ldef.h:1.5 src/usr.bin/mklocale/ldef.h:1.6
--- src/usr.bin/mklocale/ldef.h:1.5 Sat May 22 06:38:15 2010
+++ src/usr.bin/mklocale/ldef.h Sat May 22 07:18:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ldef.h,v 1.5 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: ldef.h,v 1.6 2010/05/22 07:18:44 tnozaki Exp $ */
/*-
* Copyright (c) 1993
@@ -34,6 +34,8 @@
* @(#)ldef.h 8.1 (Berkeley) 6/6/93
*/
+#include "ctype_local.h"
+
/*
* This should look a LOT like a _RuneEntry
*/
