2009-01-11 05:45:45 +03:00
|
|
|
/* $NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $ */
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
|
|
|
|
/*-
|
|
|
|
* Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-
|
|
|
|
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
|
|
* by Paul Kranenburg.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-
|
|
|
|
* 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.
|
2003-08-07 20:42:00 +04:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
2009-01-11 05:45:45 +03:00
|
|
|
__RCSID("$NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $");
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <paths.h>
|
Fixes PR lib/39662, shortcomings in LC_{MONETARY,NUMERIC,TIME,MESSAGES} db format.
ok'ed by core and releng.
(thanks for agc@, snj@ and i'm sorry for long time patience).
[libc]
- localeio.[ch] and lc*.[ch] in src/lib/libc/locale was replaced by
new locale-db implementation using citrus_db backend,
see src/lib/libc/citrus/citrus_lc_*.[ch].
- add citrus_bcs_strtou?l.c. don't use strtou?l locale implementation
internally, because they're locale-aware function.
- add some stubs for multi-locale issue, see {current,global}_locale.c.
- remove some obsolete file, setrunelocale.c, ___runetype_mb.c.
- remove __savectype() from ctypeio.[ch].
[tools]
- mklocale(1): add new option ``-t'' that generates new style
LC_{MONETARY,NUMERIC,TIME,MESSAGES} locale-db format.
- chrtbl(1): added ctypeio.[ch] for __savectype().
[locale-db]
- added en_US.US-ASCII locale.
- removed some shareable locale definition file:
en_US.US-ASCII -> en_US.ISO8859-1, en_US.UTF-8
zh_CN.eucCN -> zh_CN.GB18030
and more...see src/share/locale/*/Makefile.
- remove obsoleted locale sr_YU, added new locale sr_ME, sr_RS.
- change locale name ja_JP.ISO2022-JP* -> ja_JP.ISO-2022-JP*
for X11's locale.alias file alignments.
- fix regression test, wrong wcs?width(3), NAN/INF usage.
i tested release-build following arch:
i386, amd64, hpc{mips,arm,sh}, sparc64, vax.
citrus_lc_*.[ch] also can read old-plain-text style locale-db.
so that backward compatibility is keeped, but lc*.[ch] can't read
new citrus_db'ed locale-db and localeio.c never check sanity,
so forward compatibility is broken ;-<
old mklocale(1) doesn't know -t option, so you have to rebuild toolchain.
2009-01-02 03:20:18 +03:00
|
|
|
#include "citrus_namespace.h"
|
|
|
|
#include "citrus_bcs.h"
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
#include "citrus_module.h"
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <dirent.h>
|
|
|
|
#include <dlfcn.h>
|
|
|
|
|
|
|
|
#ifdef _I18N_DYNAMIC
|
|
|
|
|
|
|
|
static int _getdewey(int [], char *);
|
|
|
|
static int _cmpndewey(int [], int, int [], int);
|
|
|
|
static const char *_findshlib(char *, int *, int *);
|
|
|
|
|
2005-11-29 06:11:58 +03:00
|
|
|
static const char *_pathI18nModule = NULL;
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
|
|
|
|
/* from libexec/ld.aout_so/shlib.c */
|
|
|
|
#undef major
|
|
|
|
#undef minor
|
|
|
|
#define MAXDEWEY 3 /*ELF*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
_getdewey(int dewey[], char *cp)
|
|
|
|
{
|
|
|
|
int i, n;
|
|
|
|
|
|
|
|
_DIAGASSERT(dewey != NULL);
|
|
|
|
_DIAGASSERT(cp != NULL);
|
|
|
|
|
|
|
|
for (n = 0, i = 0; i < MAXDEWEY; i++) {
|
|
|
|
if (*cp == '\0')
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (*cp == '.') cp++;
|
|
|
|
if (*cp < '0' || '9' < *cp)
|
|
|
|
return 0;
|
|
|
|
|
Fixes PR lib/39662, shortcomings in LC_{MONETARY,NUMERIC,TIME,MESSAGES} db format.
ok'ed by core and releng.
(thanks for agc@, snj@ and i'm sorry for long time patience).
[libc]
- localeio.[ch] and lc*.[ch] in src/lib/libc/locale was replaced by
new locale-db implementation using citrus_db backend,
see src/lib/libc/citrus/citrus_lc_*.[ch].
- add citrus_bcs_strtou?l.c. don't use strtou?l locale implementation
internally, because they're locale-aware function.
- add some stubs for multi-locale issue, see {current,global}_locale.c.
- remove some obsolete file, setrunelocale.c, ___runetype_mb.c.
- remove __savectype() from ctypeio.[ch].
[tools]
- mklocale(1): add new option ``-t'' that generates new style
LC_{MONETARY,NUMERIC,TIME,MESSAGES} locale-db format.
- chrtbl(1): added ctypeio.[ch] for __savectype().
[locale-db]
- added en_US.US-ASCII locale.
- removed some shareable locale definition file:
en_US.US-ASCII -> en_US.ISO8859-1, en_US.UTF-8
zh_CN.eucCN -> zh_CN.GB18030
and more...see src/share/locale/*/Makefile.
- remove obsoleted locale sr_YU, added new locale sr_ME, sr_RS.
- change locale name ja_JP.ISO2022-JP* -> ja_JP.ISO-2022-JP*
for X11's locale.alias file alignments.
- fix regression test, wrong wcs?width(3), NAN/INF usage.
i tested release-build following arch:
i386, amd64, hpc{mips,arm,sh}, sparc64, vax.
citrus_lc_*.[ch] also can read old-plain-text style locale-db.
so that backward compatibility is keeped, but lc*.[ch] can't read
new citrus_db'ed locale-db and localeio.c never check sanity,
so forward compatibility is broken ;-<
old mklocale(1) doesn't know -t option, so you have to rebuild toolchain.
2009-01-02 03:20:18 +03:00
|
|
|
dewey[n++] = (int)_bcs_strtol(cp, &cp, 10);
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Compare two dewey arrays.
|
|
|
|
* Return -1 if `d1' represents a smaller value than `d2'.
|
|
|
|
* Return 1 if `d1' represents a greater value than `d2'.
|
|
|
|
* Return 0 if equal.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
_cmpndewey(int d1[], int n1, int d2[], int n2)
|
|
|
|
{
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
_DIAGASSERT(d1 != NULL);
|
|
|
|
_DIAGASSERT(d2 != NULL);
|
|
|
|
|
|
|
|
for (i = 0; i < n1 && i < n2; i++) {
|
|
|
|
if (d1[i] < d2[i])
|
|
|
|
return -1;
|
|
|
|
if (d1[i] > d2[i])
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n1 == n2)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (i == n1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (i == n2)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* XXX cannot happen */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
_findshlib(char *name, int *majorp, int *minorp)
|
|
|
|
{
|
|
|
|
int dewey[MAXDEWEY];
|
|
|
|
int ndewey;
|
|
|
|
int tmp[MAXDEWEY];
|
|
|
|
int i;
|
|
|
|
int len;
|
|
|
|
char *lname;
|
|
|
|
static char path[PATH_MAX];
|
|
|
|
int major, minor;
|
|
|
|
const char *search_dirs[1];
|
|
|
|
const int n_search_dirs = 1;
|
|
|
|
|
|
|
|
_DIAGASSERT(name != NULL);
|
|
|
|
_DIAGASSERT(majorp != NULL);
|
|
|
|
_DIAGASSERT(minorp != NULL);
|
|
|
|
|
|
|
|
major = *majorp;
|
|
|
|
minor = *minorp;
|
|
|
|
path[0] = '\0';
|
|
|
|
search_dirs[0] = _pathI18nModule;
|
|
|
|
len = strlen(name);
|
|
|
|
lname = name;
|
|
|
|
|
|
|
|
ndewey = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < n_search_dirs; i++) {
|
|
|
|
DIR *dd = opendir(search_dirs[i]);
|
|
|
|
struct dirent *dp;
|
|
|
|
int found_dot_a = 0;
|
|
|
|
int found_dot_so = 0;
|
|
|
|
|
|
|
|
if (dd == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
while ((dp = readdir(dd)) != NULL) {
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (dp->d_namlen < len + 4)
|
|
|
|
continue;
|
|
|
|
if (strncmp(dp->d_name, lname, (size_t)len) != 0)
|
|
|
|
continue;
|
|
|
|
if (strncmp(dp->d_name+len, ".so.", 4) != 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ((n = _getdewey(tmp, dp->d_name+len+4)) == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (major != -1 && found_dot_a)
|
|
|
|
found_dot_a = 0;
|
|
|
|
|
|
|
|
/* XXX should verify the library is a.out/ELF? */
|
|
|
|
|
|
|
|
if (major == -1 && minor == -1) {
|
|
|
|
goto compare_version;
|
|
|
|
} else if (major != -1 && minor == -1) {
|
|
|
|
if (tmp[0] == major)
|
|
|
|
goto compare_version;
|
|
|
|
} else if (major != -1 && minor != -1) {
|
|
|
|
if (tmp[0] == major) {
|
|
|
|
if (n == 1 || tmp[1] >= minor)
|
|
|
|
goto compare_version;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* else, this file does not qualify */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
compare_version:
|
|
|
|
if (_cmpndewey(tmp, n, dewey, ndewey) <= 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* We have a better version */
|
|
|
|
found_dot_so = 1;
|
|
|
|
snprintf(path, sizeof(path), "%s/%s", search_dirs[i],
|
|
|
|
dp->d_name);
|
|
|
|
found_dot_a = 0;
|
|
|
|
bcopy(tmp, dewey, sizeof(dewey));
|
|
|
|
ndewey = n;
|
|
|
|
*majorp = dewey[0];
|
|
|
|
*minorp = dewey[1];
|
|
|
|
}
|
|
|
|
closedir(dd);
|
|
|
|
|
|
|
|
if (found_dot_a || found_dot_so)
|
|
|
|
/*
|
|
|
|
* There's a lib in this dir; take it.
|
|
|
|
*/
|
|
|
|
return path[0] ? path : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return path[0] ? path : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
_citrus_find_getops(_citrus_module_t handle, const char *modname,
|
|
|
|
const char *ifname)
|
|
|
|
{
|
|
|
|
char name[PATH_MAX];
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
_DIAGASSERT(handle != NULL);
|
|
|
|
_DIAGASSERT(modname != NULL);
|
|
|
|
_DIAGASSERT(ifname != NULL);
|
|
|
|
|
2004-12-21 12:00:01 +03:00
|
|
|
snprintf(name, sizeof(name), _C_LABEL_STRING("_citrus_%s_%s_getops"),
|
|
|
|
modname, ifname);
|
refine i18n stuffs.
- add libc/citrus directory.
this directory contains the common stuffs not only for locale
but also other facilities relating to i18n (e.g. iconv).
- To keep the binary compatibility for the ctype modules easily,
the interface between libc and the modules is simplified.
- For the future integrated extension, module pool is renamed
from "/usr/lib/runemodule" to "/usr/lib/i18n".
In the future, this directory will contain the modules for "iconv",
"collation", etc.
- some cosmetic changes.
- Bug fix for runetype.h; __attribute__((__packed__)) is placed at
the wrong position and it is invalid unintentionally.
But, the all members of the structures seem well-aligned. Thus,
this bug causes no problem, hopefully.
HEADS UP:
- /usr/lib/rumemodule is obsoleted. If you use the multibyte locales,
you need to install /usr/lib/i18n/* from sys/lib/i18n_module .
- The binary compatibility of /usr/share/locale/*/LC_CTYPE is probably kept.
Perhaps, the bug fix about __packed__ mentioned above breaks the
compatibility... Be careful especially on 64bit platforms.
2002-03-18 01:14:05 +03:00
|
|
|
p = dlsym((void *)handle, name);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
_citrus_load_module(_citrus_module_t *rhandle, const char *encname)
|
|
|
|
{
|
|
|
|
const char *p;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
int maj, min;
|
|
|
|
void *handle;
|
|
|
|
|
|
|
|
_DIAGASSERT(rhandle != NULL);
|
|
|
|
|
|
|
|
if (_pathI18nModule == NULL) {
|
|
|
|
p = getenv("PATH_I18NMODULE");
|
|
|
|
if (p != NULL && !issetugid()) {
|
|
|
|
_pathI18nModule = strdup(p);
|
|
|
|
if (_pathI18nModule == NULL)
|
|
|
|
return ENOMEM;
|
|
|
|
} else
|
|
|
|
_pathI18nModule = _PATH_I18NMODULE;
|
|
|
|
}
|
|
|
|
|
|
|
|
(void)snprintf(path, sizeof(path), "lib%s", encname);
|
|
|
|
maj = I18NMODULE_MAJOR;
|
|
|
|
min = -1;
|
|
|
|
p = _findshlib(path, &maj, &min);
|
|
|
|
if (!p)
|
|
|
|
return (EINVAL);
|
|
|
|
handle = dlopen(p, RTLD_LAZY);
|
|
|
|
if (!handle)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
*rhandle = (_citrus_module_t)handle;
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_citrus_unload_module(_citrus_module_t handle)
|
|
|
|
{
|
|
|
|
if (handle)
|
|
|
|
dlclose((void *)handle);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* !_I18N_DYNAMIC */
|
|
|
|
|
|
|
|
void *
|
|
|
|
/*ARGSUSED*/
|
|
|
|
_citrus_find_getops(_citrus_module_t handle, const char *modname,
|
|
|
|
const char *ifname)
|
|
|
|
{
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
/*ARGSUSED*/
|
|
|
|
_citrus_load_module(_citrus_module_t *rhandle, char const *modname)
|
|
|
|
{
|
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
/*ARGSUSED*/
|
|
|
|
_citrus_unload_module(_citrus_module_t handle)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|