[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Feb 18 04:35:50 MST 2011
On Fri, 2011-02-18 at 09:30 +0100, Andrew Bartlett wrote:
> - Log -----------------------------------------------------------------
> commit 1ad8e5229f618fc04af371ba52b81f2e7e1f88f5
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 13:59:05 2011 +1100
>
> lib/util/charset Add back setlocale(), but only when called from binaries
>
> When called from a library, we don't want to call this, as we may
> overwrite some of our calling program's context.
What in particular re-added the need for this?
I'm worried about this change as it means we won't be testing the
library code that e.g. gets used as part of OpenChange and Evolution.
It would be really nice if we could get rid of our reliance on the
system locale for once and for all. :-/
Cheers,
Jelmer
> commit 2a3a86a86f3d1ab97adda563beda7ee35f6a2414
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 13:47:28 2011 +1100
>
> lib/util/charcnv Move iconv handle setup in common
>
> We now use the struct smb_iconv_convenience at the core of all our
> iconv code, and use global_iconv_convenience for the callers that
> don't specify one.
>
> Andrew Bartlett
>
> commit 5155a5f5c130ff5b71ce4e37877378a6967046b4
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 11:51:33 2011 +1100
>
> s3-charcnv Don't genreate valid_table on the fly, rely on valid.dat
>
> This file is always installed, and is only even required for the old,
> depricated mangle hash method.
>
> Andrew Bartlett
>
> commit e4c20230825dd78a2f06839dd7f6fe72f486a910
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 10:52:12 2011 +1100
>
> lib/util Remove #if _SAMBA_BUILD_ == 4 that isn't required any more
>
> commit 8afc271e2a9950fda68e99928746623093cbd6ac
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 10:24:58 2011 +1100
>
> lib/util/charset Use top level iconv.c in source3
>
> The two files were very similar already, the only change required was
> to adopt the s3 module registration fucntion name.
>
> (NTSTATUS wasn't used as the charset code does not otherwise use that
> type).
>
> Andrew Bartlett
>
> Signed-off-by: Andrew Tridgell <tridge at samba.org>
>
> commit bed374215ff040cc995659d42938be35412a794a
> Author: Andrew Tridgell <tridge at samba.org>
> Date: Fri Feb 18 10:10:30 2011 +1100
>
> s4-idl: rename s4 server_id.idl to server_id4.idl
>
> this avoids a conflict with the new s3 server_id.idl
>
> Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
>
> commit cfeceedfab64fe8b7f5823d1ada3f6d9b1799adf
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Thu Feb 17 16:29:28 2011 +1100
>
> librpc make ndr-standard a common library
>
> commit 177ddcb084e8f8608bf2012a7c58f7b1e56d2acd
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Thu Feb 17 16:19:45 2011 +1100
>
> librpc push NDR_SECURITY and NDR_DCERPC to the top level wscript files
>
> There isn't any reson to keep these private to source3 and source4 and
> more, and doing so creates problems for the top level build.
>
> Andrew Bartlett
>
> commit a493bf9103e5a36e0aef0d1bf1a055f602955d0f
> Author: Andrew Tridgell <tridge at samba.org>
> Date: Thu Feb 17 14:13:42 2011 +1100
>
> nsswitch: depend on dl
>
> The previous merge in this area didn't preserve the 'dl' depedency,
> which may be required on some platforms.
>
> Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
>
> commit 92faeaeea841dd0bce9460d25429846ae2fdc0af
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Wed Feb 16 16:30:56 2011 +1100
>
> charset Remove use of {isupper,islower,toupper,tolower}_w functions
>
> These now call the common _m functions that consider UTF16 code points.
>
> This removes the code which will make up a 'lame' table in memory, as
> this can just as correctly be handled by running the algorithm at runtime (which is to call toupper() and tolower() on characters < 128).
>
> When used, a top level waf build will always locate the correct table
> - in the build tree or outside - due to relinking the installed
> binary.
>
> Andrew Bartlett
>
> commit 0bad0e3ff2063f009557ab6ad7a442ceaed593ee
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Tue Feb 15 16:34:02 2011 +1100
>
> s3-libads Remove MIT-specific krb5_princ_realm macro calls.
>
> When compiled against heimdal, we need to use a more elegant API.
>
> Andrew Bartlett
>
> commit e4c2f5c474b2c294341edcce8044319a111e1e45
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Fri Feb 18 16:04:30 2011 +1100
>
> s3-waf use lib/util/wscript_build, and avoid duplicate subsystems
>
> commit 83a63baecc0b49dac5547551436f9fca2595f2f7
> Author: Andrew Bartlett <abartlet at samba.org>
> Date: Thu Feb 17 16:39:07 2011 +1100
>
> lib/util Make UTIL_LDB conditional on an s4 build
>
> This allows this file to be used in common.
>
> commit c8b2b109760b366bee6dcf7c6c306936d271f508
> Author: Andrew Tridgell <tridge at samba.org>
> Date: Wed Feb 9 15:56:20 2011 +1100
>
> s3-waf: use SAMBA3_*() build rules in source3/build
>
> this brings the s3 waf build much closer to the proposed s3build top
> level build, using the same bld.SAMBA3_*() rules
>
> There are a few renames of subsystems in here, with a 3 suffix where
> it would create a conflict.
>
> Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> lib/util/charset/charcnv.c | 289 --------
> lib/util/charset/charset.h | 15 +-
> lib/util/charset/codepoints.c | 390 ++++++++++-
> lib/util/charset/iconv.c | 85 ++-
> lib/util/charset/util_unistr.c | 26 -
> lib/util/charset/wscript_build | 10 +-
> lib/util/util.h | 2 -
> lib/util/wscript_build | 3 +-
> librpc/wscript_build | 25 +
> nsswitch/wins.c | 2 +-
> nsswitch/wscript_build | 2 +-
> source3/Makefile.in | 4 +-
> source3/auth/wscript_build | 22 +-
> source3/build/wscript | 4 +-
> source3/include/proto.h | 6 -
> source3/lib/charcnv.c | 315 +--------
> source3/lib/iconv.c | 775 --------------------
> source3/lib/ms_fnmatch.c | 2 +-
> source3/lib/netapi/netapi.c | 2 +-
> source3/lib/util_str.c | 4 +-
> source3/lib/util_unistr.c | 221 +-----
> source3/libads/krb5_setpw.c | 74 +--
> source3/libgpo/gpext/wscript_build | 8 +-
> source3/librpc/wscript_build | 20 +-
> source3/libsmb/libsmb_context.c | 2 +-
> source3/modules/charset_macosxfs.c | 5 +-
> source3/modules/developer.c | 8 +-
> source3/modules/weird.c | 5 +-
> source3/modules/wscript_build | 116 ++--
> source3/pam_smbpass/pam_smb_acct.c | 2 +-
> source3/pam_smbpass/pam_smb_auth.c | 2 +-
> source3/pam_smbpass/pam_smb_passwd.c | 2 +-
> source3/pam_smbpass/wscript_build | 2 +-
> source3/passdb/wscript_build | 12 +-
> source3/rpc_server/wscript_build | 44 +-
> source3/winbindd/wscript_build | 42 +-
> source3/wscript | 11 +
> source3/wscript_build | 311 ++++-----
> source4/cluster/cluster.c | 2 +-
> source4/cluster/cluster.h | 2 +-
> source4/cluster/local.c | 2 +-
> source4/lib/messaging/messaging.h | 2 +-
> source4/lib/messaging/pymessaging.c | 2 +-
> source4/librpc/idl/opendb.idl | 2 +-
> source4/librpc/idl/s4_notify.idl | 2 +-
> .../librpc/idl/{server_id.idl => server_id4.idl} | 0
> source4/librpc/idl/wscript_build | 2 +-
> source4/librpc/wscript_build | 32 +-
> source4/ntvfs/ntvfs.h | 2 +-
> source4/param/loadparm.c | 6 +-
> source4/param/util.c | 1 +
> source4/rpc_server/dcerpc_server.h | 2 +-
> source4/smbd/service_stream.h | 2 +-
> source4/smbd/service_task.h | 2 +-
> 54 files changed, 892 insertions(+), 2041 deletions(-)
> delete mode 100644 source3/lib/iconv.c
> rename source4/librpc/idl/{server_id.idl => server_id4.idl} (100%)
>
>
> Changeset truncated at 500 lines:
>
> diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
> index 59b36e3..dd2c725 100644
> --- a/lib/util/charset/charcnv.c
> +++ b/lib/util/charset/charcnv.c
> @@ -38,137 +38,6 @@
> * @sa lib/iconv.c
> */
>
> -struct smb_iconv_convenience {
> - TALLOC_CTX *child_ctx;
> - const char *unix_charset;
> - const char *dos_charset;
> - bool native_iconv;
> - smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
> -};
> -
> -
> -/**
> - * Return the name of a charset to give to iconv().
> - **/
> -static const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch)
> -{
> - switch (ch) {
> - case CH_UTF16: return "UTF-16LE";
> - case CH_UNIX: return ic->unix_charset;
> - case CH_DOS: return ic->dos_charset;
> - case CH_UTF8: return "UTF8";
> - case CH_UTF16BE: return "UTF-16BE";
> - case CH_UTF16MUNGED: return "UTF16_MUNGED";
> - default:
> - return "ASCII";
> - }
> -}
> -
> -/**
> - re-initialize iconv conversion descriptors
> -**/
> -static int close_iconv_convenience(struct smb_iconv_convenience *data)
> -{
> - unsigned c1, c2;
> - for (c1=0;c1<NUM_CHARSETS;c1++) {
> - for (c2=0;c2<NUM_CHARSETS;c2++) {
> - if (data->conv_handles[c1][c2] != NULL) {
> - if (data->conv_handles[c1][c2] != (smb_iconv_t)-1) {
> - smb_iconv_close(data->conv_handles[c1][c2]);
> - }
> - data->conv_handles[c1][c2] = NULL;
> - }
> - }
> - }
> -
> - return 0;
> -}
> -
> -/*
> - the old_ic is passed in here as the smb_iconv_convenience structure
> - is used as a global pointer in some places (eg. python modules). We
> - don't want to invalidate those global pointers, but we do want to
> - update them with the right charset information when loadparm
> - runs. To do that we need to re-use the structure pointer, but
> - re-fill the elements in the structure with the updated values
> - */
> -_PUBLIC_ struct smb_iconv_convenience *smb_iconv_convenience_reinit(TALLOC_CTX *mem_ctx,
> - const char *dos_charset,
> - const char *unix_charset,
> - bool native_iconv,
> - struct smb_iconv_convenience *old_ic)
> -{
> - struct smb_iconv_convenience *ret;
> -
> - if (old_ic != NULL) {
> - ret = old_ic;
> - close_iconv_convenience(ret);
> - talloc_free(ret->child_ctx);
> - ZERO_STRUCTP(ret);
> - } else {
> - ret = talloc_zero(mem_ctx, struct smb_iconv_convenience);
> - }
> - if (ret == NULL) {
> - return NULL;
> - }
> -
> - /* we use a child context to allow us to free all ptrs without
> - freeing the structure itself */
> - ret->child_ctx = talloc_new(ret);
> - if (ret->child_ctx == NULL) {
> - return NULL;
> - }
> -
> - talloc_set_destructor(ret, close_iconv_convenience);
> -
> - ret->dos_charset = talloc_strdup(ret->child_ctx, dos_charset);
> - ret->unix_charset = talloc_strdup(ret->child_ctx, unix_charset);
> - ret->native_iconv = native_iconv;
> -
> - return ret;
> -}
> -
> -/*
> - on-demand initialisation of conversion handles
> -*/
> -static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic,
> - charset_t from, charset_t to)
> -{
> - const char *n1, *n2;
> - static bool initialised;
> -
> - if (initialised == false) {
> - initialised = true;
> - }
> -
> - if (ic->conv_handles[from][to]) {
> - return ic->conv_handles[from][to];
> - }
> -
> - n1 = charset_name(ic, from);
> - n2 = charset_name(ic, to);
> -
> - ic->conv_handles[from][to] = smb_iconv_open_ex(ic, n2, n1,
> - ic->native_iconv);
> -
> - if (ic->conv_handles[from][to] == (smb_iconv_t)-1) {
> - if ((from == CH_DOS || to == CH_DOS) &&
> - strcasecmp(charset_name(ic, CH_DOS), "ASCII") != 0) {
> - DEBUG(0,("dos charset '%s' unavailable - using ASCII\n",
> - charset_name(ic, CH_DOS)));
> - ic->dos_charset = "ASCII";
> -
> - n1 = charset_name(ic, from);
> - n2 = charset_name(ic, to);
> -
> - ic->conv_handles[from][to] =
> - smb_iconv_open_ex(ic, n2, n1, ic->native_iconv);
> - }
> - }
> -
> - return ic->conv_handles[from][to];
> -}
> -
> /**
> * Convert string from one encoding to another, making error checking etc
> *
> @@ -363,161 +232,3 @@ _PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
> return true;
> }
>
> -
> -/**
> - * Return the unicode codepoint for the next character in the input
> - * string in the given src_charset.
> - * The unicode codepoint (codepoint_t) is an unsinged 32 bit value.
> - *
> - * Also return the number of bytes consumed (which tells the caller
> - * how many bytes to skip to get to the next src_charset-character).
> - *
> - * This is implemented (in the non-ascii-case) by first converting the
> - * next character in the input string to UTF16_LE and then calculating
> - * the unicode codepoint from that.
> - *
> - * Return INVALID_CODEPOINT if the next character cannot be converted.
> - */
> -_PUBLIC_ codepoint_t next_codepoint_convenience_ext(
> - struct smb_iconv_convenience *ic,
> - const char *str, charset_t src_charset,
> - size_t *bytes_consumed)
> -{
> - /* it cannot occupy more than 4 bytes in UTF16 format */
> - uint8_t buf[4];
> - smb_iconv_t descriptor;
> - size_t ilen_orig;
> - size_t ilen;
> - size_t olen;
> - char *outbuf;
> -
> - if ((str[0] & 0x80) == 0) {
> - *bytes_consumed = 1;
> - return (codepoint_t)str[0];
> - }
> -
> - /*
> - * we assume that no multi-byte character can take more than 5 bytes.
> - * This is OK as we only support codepoints up to 1M (U+100000)
> - */
> - ilen_orig = strnlen(str, 5);
> - ilen = ilen_orig;
> -
> - descriptor = get_conv_handle(ic, src_charset, CH_UTF16);
> - if (descriptor == (smb_iconv_t)-1) {
> - *bytes_consumed = 1;
> - return INVALID_CODEPOINT;
> - }
> -
> - /*
> - * this looks a little strange, but it is needed to cope with
> - * codepoints above 64k (U+1000) which are encoded as per RFC2781.
> - */
> - olen = 2;
> - outbuf = (char *)buf;
> - smb_iconv(descriptor, &str, &ilen, &outbuf, &olen);
> - if (olen == 2) {
> - olen = 4;
> - outbuf = (char *)buf;
> - smb_iconv(descriptor, &str, &ilen, &outbuf, &olen);
> - if (olen == 4) {
> - /* we didn't convert any bytes */
> - *bytes_consumed = 1;
> - return INVALID_CODEPOINT;
> - }
> - olen = 4 - olen;
> - } else {
> - olen = 2 - olen;
> - }
> -
> - *bytes_consumed = ilen_orig - ilen;
> -
> - if (olen == 2) {
> - return (codepoint_t)SVAL(buf, 0);
> - }
> - if (olen == 4) {
> - /* decode a 4 byte UTF16 character manually */
> - return (codepoint_t)0x10000 +
> - (buf[2] | ((buf[3] & 0x3)<<8) |
> - (buf[0]<<10) | ((buf[1] & 0x3)<<18));
> - }
> -
> - /* no other length is valid */
> - return INVALID_CODEPOINT;
> -}
> -
> -/*
> - return the unicode codepoint for the next multi-byte CH_UNIX character
> - in the string
> -
> - also return the number of bytes consumed (which tells the caller
> - how many bytes to skip to get to the next CH_UNIX character)
> -
> - return INVALID_CODEPOINT if the next character cannot be converted
> -*/
> -_PUBLIC_ codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic,
> - const char *str, size_t *size)
> -{
> - return next_codepoint_convenience_ext(ic, str, CH_UNIX, size);
> -}
> -
> -/*
> - push a single codepoint into a CH_UNIX string the target string must
> - be able to hold the full character, which is guaranteed if it is at
> - least 5 bytes in size. The caller may pass less than 5 bytes if they
> - are sure the character will fit (for example, you can assume that
> - uppercase/lowercase of a character will not add more than 1 byte)
> -
> - return the number of bytes occupied by the CH_UNIX character, or
> - -1 on failure
> -*/
> -_PUBLIC_ ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic,
> - char *str, codepoint_t c)
> -{
> - smb_iconv_t descriptor;
> - uint8_t buf[4];
> - size_t ilen, olen;
> - const char *inbuf;
> -
> - if (c < 128) {
> - *str = c;
> - return 1;
> - }
> -
> - descriptor = get_conv_handle(ic,
> - CH_UTF16, CH_UNIX);
> - if (descriptor == (smb_iconv_t)-1) {
> - return -1;
> - }
> -
> - if (c < 0x10000) {
> - ilen = 2;
> - olen = 5;
> - inbuf = (char *)buf;
> - SSVAL(buf, 0, c);
> - smb_iconv(descriptor, &inbuf, &ilen, &str, &olen);
> - if (ilen != 0) {
> - return -1;
> - }
> - return 5 - olen;
> - }
> -
> - c -= 0x10000;
> -
> - buf[0] = (c>>10) & 0xFF;
> - buf[1] = (c>>18) | 0xd8;
> - buf[2] = c & 0xFF;
> - buf[3] = ((c>>8) & 0x3) | 0xdc;
> -
> - ilen = 4;
> - olen = 5;
> - inbuf = (char *)buf;
> -
> - smb_iconv(descriptor, &inbuf, &ilen, &str, &olen);
> - if (ilen != 0) {
> - return -1;
> - }
> - return 5 - olen;
> -}
> -
> -
> diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
> index 901885d..474d77e 100644
> --- a/lib/util/charset/charset.h
> +++ b/lib/util/charset/charset.h
> @@ -170,6 +170,10 @@ ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
> void *dest);
>
> extern struct smb_iconv_convenience *global_iconv_convenience;
> +struct smb_iconv_convenience *get_iconv_convenience(void);
> +smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic,
> + charset_t from, charset_t to);
> +const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch);
>
> codepoint_t next_codepoint_ext(const char *str, charset_t src_charset,
> size_t *size);
> @@ -195,6 +199,7 @@ int codepoint_cmpi(codepoint_t c1, codepoint_t c2);
> struct smb_iconv_convenience *smb_iconv_convenience_reinit(TALLOC_CTX *mem_ctx,
> const char *dos_charset,
> const char *unix_charset,
> + const char *display_charset,
> bool native_iconv,
> struct smb_iconv_convenience *old_ic);
>
> @@ -218,7 +223,8 @@ smb_iconv_t smb_iconv_open_ex(TALLOC_CTX *mem_ctx, const char *tocode,
> const char *fromcode, bool native_iconv);
>
> void load_case_tables(void);
> -bool charset_register_backend(const void *_funcs);
> +void load_case_tables_library(void);
> +bool smb_register_charset(const struct charset_functions *funcs_in);
>
> /*
> * Define stub for charset module which implements 8-bit encoding with gaps.
> @@ -293,8 +299,11 @@ struct charset_functions CHARSETNAME ## _functions = \
> NTSTATUS charset_ ## CHARSETNAME ## _init(void); \
> NTSTATUS charset_ ## CHARSETNAME ## _init(void) \
> { \
> - return smb_register_charset(& CHARSETNAME ## _functions); \
> -} \
> + if (!smb_register_charset(& CHARSETNAME ## _functions)) { \
> + return NT_STATUS_INTERNAL_ERROR; \
> + } \
> + return NT_STATUS_OK; \
> +} \
>
>
> #endif /* __CHARSET_H__ */
> diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
> index 5dc7614..5ee95a8 100644
> --- a/lib/util/charset/codepoints.c
> +++ b/lib/util/charset/codepoints.c
> @@ -1,8 +1,10 @@
> /*
> Unix SMB/CIFS implementation.
> - Samba utility functions
> - Copyright (C) Andrew Tridgell 1992-2001
> + Character set conversion Extensions
> + Copyright (C) Igor Vergeichik <iverg at mail.ru> 2001
> + Copyright (C) Andrew Tridgell 2001
> Copyright (C) Simo Sorce 2001
> + Copyright (C) Jelmer Vernooij 2007
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -16,12 +18,17 @@
>
> You should have received a copy of the GNU General Public License
> along with this program. If not, see <http://www.gnu.org/licenses/>.
> -*/
>
> +*/
> #include "includes.h"
> +#include "lib/util/charset/charset.h"
> #include "system/locale.h"
> #include "dynconfig.h"
>
> +#ifdef strcasecmp
> +#undef strcasecmp
> +#endif
> +
> /**
> * @file
> * @brief Unicode string manipulation
> @@ -35,8 +42,10 @@ static void *lowcase_table;
>
> /*******************************************************************
> load the case handling tables
> +
> +This is the function that should be called from library code.
> ********************************************************************/
> -void load_case_tables(void)
> +void load_case_tables_library(void)
> {
> TALLOC_CTX *mem_ctx;
>
> @@ -48,13 +57,33 @@ void load_case_tables(void)
> lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", get_dyn_CODEPAGEDIR()), 0x20000);
> talloc_free(mem_ctx);
> if (upcase_table == NULL) {
> + DEBUG(1, ("Failed to load upcase.dat, will use lame ASCII-only case sensitivity rules\n"));
> upcase_table = (void *)-1;
> }
> if (lowcase_table == NULL) {
> + DEBUG(1, ("Failed to load lowcase.dat, will use lame ASCII-only case sensitivity rules\n"));
> lowcase_table = (void *)-1;
> }
> }
>
> +/*******************************************************************
> +load the case handling tables
> +
> +This MUST only be called from main() in application code, never from a
> +library. We don't know if the calling program has already done
> +setlocale() to another value, and can't tell if they have.
> +********************************************************************/
> +void load_case_tables(void)
> +{
> + /* This is a useful global hook where we can ensure that the
> + * locale is set from the environment. This is needed so that
> + * we can use LOCALE as a codepage */
> +#ifdef HAVE_SETLOCALE
> + setlocale(LC_ALL, "");
> +#endif
> + load_case_tables_library();
> +}
> +
> /**
> Convert a codepoint_t to upper case.
> **/
> @@ -64,7 +93,7 @@ _PUBLIC_ codepoint_t toupper_m(codepoint_t val)
> return toupper(val);
> }
> if (upcase_table == NULL) {
> - load_case_tables();
> + load_case_tables_library();
> }
> if (upcase_table == (void *)-1) {
> return val;
> @@ -84,7 +113,7 @@ _PUBLIC_ codepoint_t tolower_m(codepoint_t val)
> return tolower(val);
> }
> if (lowcase_table == NULL) {
> - load_case_tables();
> + load_case_tables_library();
> }
> if (lowcase_table == (void *)-1) {
> return val;
> @@ -124,3 +153,352 @@ _PUBLIC_ int codepoint_cmpi(codepoint_t c1, codepoint_t c2)
> }
>
>
> +struct smb_iconv_convenience {
> + TALLOC_CTX *child_ctx;
> + const char *unix_charset;
> + const char *dos_charset;
> + const char *display_charset;
> + bool native_iconv;
> + smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
> +};
> +
> +struct smb_iconv_convenience *global_iconv_convenience = NULL;
> +
> +struct smb_iconv_convenience *get_iconv_convenience(void)
> +{
> + if (global_iconv_convenience == NULL)
> + global_iconv_convenience = smb_iconv_convenience_reinit(talloc_autofree_context(),
> + "ASCII", "UTF-8", "ASCII", true, NULL);
> + return global_iconv_convenience;
> +}
> +
> +/**
> + * Return the name of a charset to give to iconv().
> + **/
> +const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch)
> +{
> + switch (ch) {
> + case CH_UTF16: return "UTF-16LE";
> + case CH_UNIX: return ic->unix_charset;
> + case CH_DOS: return ic->dos_charset;
> + case CH_DISPLAY: return ic->display_charset;
> + case CH_UTF8: return "UTF8";
> + case CH_UTF16BE: return "UTF-16BE";
> + case CH_UTF16MUNGED: return "UTF16_MUNGED";
> + default:
> + return "ASCII";
> + }
> +}
> +
> +/**
> + re-initialize iconv conversion descriptors
> +**/
> +static int close_iconv_convenience(struct smb_iconv_convenience *data)
> +{
> + unsigned c1, c2;
> + for (c1=0;c1<NUM_CHARSETS;c1++) {
> + for (c2=0;c2<NUM_CHARSETS;c2++) {
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-cvs/attachments/20110218/be48461b/attachment-0001.pgp>
More information about the samba-cvs
mailing list