2001-12-06 13:10:51 +01:00
|
|
|
/* Copyright (C) 2000 MySQL AB
|
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-07-31 21:29:14 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2001-12-06 13:10:51 +01:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU 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 */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2001-09-14 01:54:33 +02:00
|
|
|
#include <my_global.h>
|
2000-07-31 21:29:14 +02:00
|
|
|
#include <m_ctype.h>
|
2003-01-14 10:36:22 +01:00
|
|
|
#include <my_xml.h>
|
2001-11-26 02:52:23 +01:00
|
|
|
#ifndef SCO
|
2001-08-25 18:18:20 +02:00
|
|
|
#include <m_string.h>
|
2001-11-26 02:52:23 +01:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
2004-06-03 14:45:53 +02:00
|
|
|
/*
|
|
|
|
|
|
|
|
This files implements routines which parse XML based
|
|
|
|
character set and collation description files.
|
|
|
|
|
|
|
|
Unicode collations are encoded according to
|
|
|
|
|
|
|
|
Unicode Technical Standard #35
|
|
|
|
Locale Data Markup Language (LDML)
|
|
|
|
http://www.unicode.org/reports/tr35/
|
|
|
|
|
|
|
|
and converted into ICU string according to
|
|
|
|
|
|
|
|
Collation Customization
|
|
|
|
http://oss.software.ibm.com/icu/userguide/Collate_Customization.html
|
|
|
|
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-01-14 10:36:22 +01:00
|
|
|
static char *mstr(char *str,const char *src,uint l1,uint l2)
|
|
|
|
{
|
|
|
|
l1= l1<l2 ? l1 : l2;
|
|
|
|
memcpy(str,src,l1);
|
|
|
|
str[l1]='\0';
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct my_cs_file_section_st
|
|
|
|
{
|
|
|
|
int state;
|
|
|
|
const char *str;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define _CS_MISC 1
|
|
|
|
#define _CS_ID 2
|
|
|
|
#define _CS_CSNAME 3
|
|
|
|
#define _CS_FAMILY 4
|
|
|
|
#define _CS_ORDER 5
|
|
|
|
#define _CS_COLNAME 6
|
|
|
|
#define _CS_FLAG 7
|
|
|
|
#define _CS_CHARSET 8
|
|
|
|
#define _CS_COLLATION 9
|
|
|
|
#define _CS_UPPERMAP 10
|
|
|
|
#define _CS_LOWERMAP 11
|
|
|
|
#define _CS_UNIMAP 12
|
|
|
|
#define _CS_COLLMAP 13
|
|
|
|
#define _CS_CTYPEMAP 14
|
2003-03-05 13:43:10 +01:00
|
|
|
#define _CS_PRIMARY_ID 15
|
|
|
|
#define _CS_BINARY_ID 16
|
2003-03-25 13:12:49 +01:00
|
|
|
#define _CS_CSDESCRIPT 17
|
2004-06-03 14:45:53 +02:00
|
|
|
#define _CS_RESET 18
|
|
|
|
#define _CS_DIFF1 19
|
|
|
|
#define _CS_DIFF2 20
|
|
|
|
#define _CS_DIFF3 21
|
|
|
|
|
2003-01-14 10:36:22 +01:00
|
|
|
|
|
|
|
static struct my_cs_file_section_st sec[] =
|
|
|
|
{
|
|
|
|
{_CS_MISC, "xml"},
|
2006-07-25 15:46:43 +02:00
|
|
|
{_CS_MISC, "xml/version"},
|
|
|
|
{_CS_MISC, "xml/encoding"},
|
2003-01-14 10:36:22 +01:00
|
|
|
{_CS_MISC, "charsets"},
|
2006-07-25 15:46:43 +02:00
|
|
|
{_CS_MISC, "charsets/max-id"},
|
|
|
|
{_CS_CHARSET, "charsets/charset"},
|
|
|
|
{_CS_PRIMARY_ID, "charsets/charset/primary-id"},
|
|
|
|
{_CS_BINARY_ID, "charsets/charset/binary-id"},
|
|
|
|
{_CS_CSNAME, "charsets/charset/name"},
|
|
|
|
{_CS_FAMILY, "charsets/charset/family"},
|
|
|
|
{_CS_CSDESCRIPT, "charsets/charset/description"},
|
|
|
|
{_CS_MISC, "charsets/charset/alias"},
|
|
|
|
{_CS_MISC, "charsets/charset/ctype"},
|
|
|
|
{_CS_CTYPEMAP, "charsets/charset/ctype/map"},
|
|
|
|
{_CS_MISC, "charsets/charset/upper"},
|
|
|
|
{_CS_UPPERMAP, "charsets/charset/upper/map"},
|
|
|
|
{_CS_MISC, "charsets/charset/lower"},
|
|
|
|
{_CS_LOWERMAP, "charsets/charset/lower/map"},
|
|
|
|
{_CS_MISC, "charsets/charset/unicode"},
|
|
|
|
{_CS_UNIMAP, "charsets/charset/unicode/map"},
|
|
|
|
{_CS_COLLATION, "charsets/charset/collation"},
|
|
|
|
{_CS_COLNAME, "charsets/charset/collation/name"},
|
|
|
|
{_CS_ID, "charsets/charset/collation/id"},
|
|
|
|
{_CS_ORDER, "charsets/charset/collation/order"},
|
|
|
|
{_CS_FLAG, "charsets/charset/collation/flag"},
|
|
|
|
{_CS_COLLMAP, "charsets/charset/collation/map"},
|
|
|
|
{_CS_RESET, "charsets/charset/collation/rules/reset"},
|
|
|
|
{_CS_DIFF1, "charsets/charset/collation/rules/p"},
|
|
|
|
{_CS_DIFF2, "charsets/charset/collation/rules/s"},
|
|
|
|
{_CS_DIFF3, "charsets/charset/collation/rules/t"},
|
2003-01-14 10:36:22 +01:00
|
|
|
{0, NULL}
|
|
|
|
};
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static struct my_cs_file_section_st * cs_file_sec(const char *attr, size_t len)
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
struct my_cs_file_section_st *s;
|
|
|
|
for (s=sec; s->str; s++)
|
|
|
|
{
|
|
|
|
if (!strncmp(attr,s->str,len))
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2003-03-25 13:12:49 +01:00
|
|
|
#define MY_CS_CSDESCR_SIZE 64
|
2007-06-07 14:55:55 +02:00
|
|
|
#define MY_CS_TAILORING_SIZE 1024
|
2003-03-25 13:12:49 +01:00
|
|
|
|
2003-01-14 10:36:22 +01:00
|
|
|
typedef struct my_cs_file_info
|
|
|
|
{
|
|
|
|
char csname[MY_CS_NAME_SIZE];
|
|
|
|
char name[MY_CS_NAME_SIZE];
|
|
|
|
uchar ctype[MY_CS_CTYPE_TABLE_SIZE];
|
|
|
|
uchar to_lower[MY_CS_TO_LOWER_TABLE_SIZE];
|
|
|
|
uchar to_upper[MY_CS_TO_UPPER_TABLE_SIZE];
|
|
|
|
uchar sort_order[MY_CS_SORT_ORDER_TABLE_SIZE];
|
|
|
|
uint16 tab_to_uni[MY_CS_TO_UNI_TABLE_SIZE];
|
2003-03-25 13:12:49 +01:00
|
|
|
char comment[MY_CS_CSDESCR_SIZE];
|
2004-06-08 14:56:15 +02:00
|
|
|
char tailoring[MY_CS_TAILORING_SIZE];
|
|
|
|
size_t tailoring_length;
|
2003-01-14 10:36:22 +01:00
|
|
|
CHARSET_INFO cs;
|
|
|
|
int (*add_collation)(CHARSET_INFO *cs);
|
|
|
|
} MY_CHARSET_LOADER;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int fill_uchar(uchar *a,uint size,const char *str, uint len)
|
|
|
|
{
|
|
|
|
uint i= 0;
|
|
|
|
const char *s, *b, *e=str+len;
|
|
|
|
|
|
|
|
for (s=str ; s < e ; i++)
|
|
|
|
{
|
|
|
|
for ( ; (s < e) && strchr(" \t\r\n",s[0]); s++) ;
|
|
|
|
b=s;
|
|
|
|
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
|
|
|
|
if (s == b || i > size)
|
|
|
|
break;
|
2003-01-29 12:08:09 +01:00
|
|
|
a[i]= (uchar) strtoul(b,NULL,16);
|
2003-01-14 10:36:22 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int fill_uint16(uint16 *a,uint size,const char *str, size_t len)
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
uint i= 0;
|
2003-01-16 14:17:07 +01:00
|
|
|
|
2003-01-14 10:36:22 +01:00
|
|
|
const char *s, *b, *e=str+len;
|
|
|
|
for (s=str ; s < e ; i++)
|
|
|
|
{
|
|
|
|
for ( ; (s < e) && strchr(" \t\r\n",s[0]); s++) ;
|
|
|
|
b=s;
|
|
|
|
for ( ; (s < e) && !strchr(" \t\r\n",s[0]); s++) ;
|
|
|
|
if (s == b || i > size)
|
|
|
|
break;
|
2003-01-29 12:08:09 +01:00
|
|
|
a[i]= (uint16) strtol(b,NULL,16);
|
2003-01-14 10:36:22 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int cs_enter(MY_XML_PARSER *st,const char *attr, size_t len)
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
|
|
struct my_cs_file_section_st *s= cs_file_sec(attr,len);
|
|
|
|
|
|
|
|
if ( s && (s->state == _CS_CHARSET))
|
|
|
|
bzero(&i->cs,sizeof(i->cs));
|
2004-06-03 14:45:53 +02:00
|
|
|
|
|
|
|
if (s && (s->state == _CS_COLLATION))
|
2004-06-08 14:56:15 +02:00
|
|
|
i->tailoring_length= 0;
|
2004-06-03 14:45:53 +02:00
|
|
|
|
2003-01-14 10:36:22 +01:00
|
|
|
return MY_XML_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int cs_leave(MY_XML_PARSER *st,const char *attr, size_t len)
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
|
|
struct my_cs_file_section_st *s= cs_file_sec(attr,len);
|
|
|
|
int state= s ? s->state : 0;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
switch(state){
|
|
|
|
case _CS_COLLATION:
|
|
|
|
rc= i->add_collation ? i->add_collation(&i->cs) : MY_XML_OK;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
rc=MY_XML_OK;
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int cs_value(MY_XML_PARSER *st,const char *attr, size_t len)
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
|
|
|
|
struct my_cs_file_section_st *s;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
int state= (int)((s=cs_file_sec(st->attr, strlen(st->attr))) ? s->state :
|
|
|
|
0);
|
2003-01-14 10:36:22 +01:00
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
case _CS_ID:
|
2003-01-29 12:08:09 +01:00
|
|
|
i->cs.number= strtol(attr,(char**)NULL,10);
|
2003-01-14 10:36:22 +01:00
|
|
|
break;
|
2003-03-05 13:43:10 +01:00
|
|
|
case _CS_BINARY_ID:
|
|
|
|
i->cs.binary_number= strtol(attr,(char**)NULL,10);
|
|
|
|
break;
|
|
|
|
case _CS_PRIMARY_ID:
|
|
|
|
i->cs.primary_number= strtol(attr,(char**)NULL,10);
|
|
|
|
break;
|
2003-01-14 10:36:22 +01:00
|
|
|
case _CS_COLNAME:
|
|
|
|
i->cs.name=mstr(i->name,attr,len,MY_CS_NAME_SIZE-1);
|
|
|
|
break;
|
|
|
|
case _CS_CSNAME:
|
|
|
|
i->cs.csname=mstr(i->csname,attr,len,MY_CS_NAME_SIZE-1);
|
|
|
|
break;
|
2003-03-25 13:12:49 +01:00
|
|
|
case _CS_CSDESCRIPT:
|
|
|
|
i->cs.comment=mstr(i->comment,attr,len,MY_CS_CSDESCR_SIZE-1);
|
|
|
|
break;
|
2003-01-14 10:36:22 +01:00
|
|
|
case _CS_FLAG:
|
|
|
|
if (!strncmp("primary",attr,len))
|
|
|
|
i->cs.state|= MY_CS_PRIMARY;
|
2003-03-04 08:04:19 +01:00
|
|
|
else if (!strncmp("binary",attr,len))
|
|
|
|
i->cs.state|= MY_CS_BINSORT;
|
2003-05-22 14:20:19 +02:00
|
|
|
else if (!strncmp("compiled",attr,len))
|
|
|
|
i->cs.state|= MY_CS_COMPILED;
|
2003-01-14 10:36:22 +01:00
|
|
|
break;
|
|
|
|
case _CS_UPPERMAP:
|
|
|
|
fill_uchar(i->to_upper,MY_CS_TO_UPPER_TABLE_SIZE,attr,len);
|
|
|
|
i->cs.to_upper=i->to_upper;
|
|
|
|
break;
|
|
|
|
case _CS_LOWERMAP:
|
|
|
|
fill_uchar(i->to_lower,MY_CS_TO_LOWER_TABLE_SIZE,attr,len);
|
|
|
|
i->cs.to_lower=i->to_lower;
|
|
|
|
break;
|
|
|
|
case _CS_UNIMAP:
|
|
|
|
fill_uint16(i->tab_to_uni,MY_CS_TO_UNI_TABLE_SIZE,attr,len);
|
|
|
|
i->cs.tab_to_uni=i->tab_to_uni;
|
|
|
|
break;
|
|
|
|
case _CS_COLLMAP:
|
|
|
|
fill_uchar(i->sort_order,MY_CS_SORT_ORDER_TABLE_SIZE,attr,len);
|
|
|
|
i->cs.sort_order=i->sort_order;
|
|
|
|
break;
|
|
|
|
case _CS_CTYPEMAP:
|
|
|
|
fill_uchar(i->ctype,MY_CS_CTYPE_TABLE_SIZE,attr,len);
|
|
|
|
i->cs.ctype=i->ctype;
|
|
|
|
break;
|
2004-06-03 14:45:53 +02:00
|
|
|
case _CS_RESET:
|
|
|
|
case _CS_DIFF1:
|
|
|
|
case _CS_DIFF2:
|
|
|
|
case _CS_DIFF3:
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Convert collation description from
|
|
|
|
Locale Data Markup Language (LDML)
|
|
|
|
into ICU Collation Customization expression.
|
|
|
|
*/
|
|
|
|
char arg[16];
|
|
|
|
const char *cmd[]= {"&","<","<<","<<<"};
|
2004-06-08 14:56:15 +02:00
|
|
|
i->cs.tailoring= i->tailoring;
|
2004-06-03 14:45:53 +02:00
|
|
|
mstr(arg,attr,len,sizeof(arg)-1);
|
2004-06-08 14:56:15 +02:00
|
|
|
if (i->tailoring_length + 20 < sizeof(i->tailoring))
|
2004-06-03 14:45:53 +02:00
|
|
|
{
|
2004-06-08 14:56:15 +02:00
|
|
|
char *dst= i->tailoring_length + i->tailoring;
|
|
|
|
i->tailoring_length+= sprintf(dst," %s %s",cmd[state-_CS_RESET],arg);
|
2004-06-03 14:45:53 +02:00
|
|
|
}
|
|
|
|
}
|
2003-01-14 10:36:22 +01:00
|
|
|
}
|
|
|
|
return MY_XML_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_bool my_parse_charset_xml(const char *buf, size_t len,
|
|
|
|
int (*add_collation)(CHARSET_INFO *cs))
|
2003-01-14 10:36:22 +01:00
|
|
|
{
|
|
|
|
MY_XML_PARSER p;
|
|
|
|
struct my_cs_file_info i;
|
|
|
|
my_bool rc;
|
|
|
|
|
|
|
|
my_xml_parser_create(&p);
|
|
|
|
my_xml_set_enter_handler(&p,cs_enter);
|
|
|
|
my_xml_set_value_handler(&p,cs_value);
|
|
|
|
my_xml_set_leave_handler(&p,cs_leave);
|
|
|
|
i.add_collation= add_collation;
|
|
|
|
my_xml_set_user_data(&p,(void*)&i);
|
|
|
|
rc= (my_xml_parse(&p,buf,len) == MY_XML_OK) ? FALSE : TRUE;
|
|
|
|
my_xml_parser_free(&p);
|
|
|
|
return rc;
|
|
|
|
}
|
2007-08-03 12:25:23 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check repertoire: detect pure ascii strings
|
|
|
|
*/
|
|
|
|
uint
|
|
|
|
my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong length)
|
|
|
|
{
|
|
|
|
const char *strend= str + length;
|
|
|
|
if (cs->mbminlen == 1)
|
|
|
|
{
|
|
|
|
for ( ; str < strend; str++)
|
|
|
|
{
|
|
|
|
if (((uchar) *str) > 0x7F)
|
|
|
|
return MY_REPERTOIRE_UNICODE30;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my_wc_t wc;
|
|
|
|
int chlen;
|
|
|
|
for (; (chlen= cs->cset->mb_wc(cs, &wc, str, strend)) > 0; str+= chlen)
|
|
|
|
{
|
|
|
|
if (wc > 0x7F)
|
|
|
|
return MY_REPERTOIRE_UNICODE30;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return MY_REPERTOIRE_ASCII;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Detect whether a character set is ASCII compatible.
|
|
|
|
|
|
|
|
Returns TRUE for:
|
|
|
|
|
|
|
|
- all 8bit character sets whose Unicode mapping of 0x7B is '{'
|
|
|
|
(ignores swe7 which maps 0x7B to "LATIN LETTER A WITH DIAERESIS")
|
|
|
|
|
|
|
|
- all multi-byte character sets having mbminlen == 1
|
|
|
|
(ignores ucs2 whose mbminlen is 2)
|
|
|
|
|
|
|
|
TODO:
|
|
|
|
|
|
|
|
When merging to 5.2, this function should be changed
|
|
|
|
to check a new flag MY_CS_NONASCII,
|
|
|
|
|
|
|
|
return (cs->flag & MY_CS_NONASCII) ? 0 : 1;
|
|
|
|
|
|
|
|
This flag was previously added into 5.2 under terms
|
|
|
|
of WL#3759 "Optimize identifier conversion in client-server protocol"
|
|
|
|
especially to mark character sets not compatible with ASCII.
|
|
|
|
|
|
|
|
We won't backport this flag to 5.0 or 5.1.
|
|
|
|
This function is Ok for 5.0 and 5.1, because we're not going
|
|
|
|
to introduce new tricky character sets between 5.0 and 5.2.
|
|
|
|
*/
|
|
|
|
my_bool
|
|
|
|
my_charset_is_ascii_based(CHARSET_INFO *cs)
|
|
|
|
{
|
|
|
|
return
|
|
|
|
(cs->mbmaxlen == 1 && cs->tab_to_uni && cs->tab_to_uni['{'] == '{') ||
|
|
|
|
(cs->mbminlen == 1 && cs->mbmaxlen > 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Detect if a character set is 8bit,
|
|
|
|
and it is pure ascii, i.e. doesn't have
|
|
|
|
characters outside U+0000..U+007F
|
|
|
|
This functions is shared between "conf_to_src"
|
|
|
|
and dynamic charsets loader in "mysqld".
|
|
|
|
*/
|
|
|
|
my_bool
|
|
|
|
my_charset_is_8bit_pure_ascii(CHARSET_INFO *cs)
|
|
|
|
{
|
|
|
|
size_t code;
|
|
|
|
if (!cs->tab_to_uni)
|
|
|
|
return 0;
|
|
|
|
for (code= 0; code < 256; code++)
|
|
|
|
{
|
|
|
|
if (cs->tab_to_uni[code] > 0x7F)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|