mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
Benefits of this patch: - Removed a lot of calls to strlen(), especially for field_string - Strings generated by parser are now const strings, less chance of accidently changing a string - Removed a lot of calls with LEX_STRING as parameter (changed to pointer) - More uniform code - Item::name_length was not kept up to date. Now fixed - Several bugs found and fixed (Access to null pointers, access of freed memory, wrong arguments to printf like functions) - Removed a lot of casts from (const char*) to (char*) Changes: - This caused some ABI changes - lex_string_set now uses LEX_CSTRING - Some fucntions are now taking const char* instead of char* - Create_field::change and after changed to LEX_CSTRING - handler::connect_string, comment and engine_name() changed to LEX_CSTRING - Checked printf() related calls to find bugs. Found and fixed several errors in old code. - A lot of changes from LEX_STRING to LEX_CSTRING, especially related to parsing and events. - Some changes from LEX_STRING and LEX_STRING & to LEX_CSTRING* - Some changes for char* to const char* - Added printf argument checking for my_snprintf() - Introduced null_clex_str, star_clex_string, temp_lex_str to simplify code - Added item_empty_name and item_used_name to be able to distingush between items that was given an empty name and items that was not given a name This is used in sql_yacc.yy to know when to give an item a name. - select table_name."*' is not anymore same as table_name.* - removed not used function Item::rename() - Added comparision of item->name_length before some calls to my_strcasecmp() to speed up comparison - Moved Item_sp_variable::make_field() from item.h to item.cc - Some minimal code changes to avoid copying to const char * - Fixed wrong error message in wsrep_mysql_parse() - Fixed wrong code in find_field_in_natural_join() where real_item() was set when it shouldn't - ER_ERROR_ON_RENAME was used with extra arguments. - Removed some (wrong) ER_OUTOFMEMORY, as alloc_root will already give the error. TODO: - Check possible unsafe casts in plugin/auth_examples/qa_auth_interface.c - Change code to not modify LEX_CSTRING for database name (as part of lower_case_table_names)
119 lines
3.8 KiB
C
119 lines
3.8 KiB
C
#ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
|
|
/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/**
|
|
@file
|
|
my_snprintf service
|
|
|
|
Portable and limited vsnprintf() implementation.
|
|
|
|
This is a portable, limited vsnprintf() implementation, with some
|
|
extra features. "Portable" means that it'll produce identical result
|
|
on all platforms (for example, on Windows and Linux system printf %e
|
|
formats the exponent differently, on different systems %p either
|
|
prints leading 0x or not, %s may accept null pointer or crash on
|
|
it). "Limited" means that it does not support all the C89 features.
|
|
But it supports few extensions, not in any standard.
|
|
|
|
my_vsnprintf(to, n, fmt, ap)
|
|
|
|
@param[out] to A buffer to store the result in
|
|
@param[in] n Store up to n-1 characters, followed by an end 0
|
|
@param[in] fmt printf-like format string
|
|
@param[in] ap Arguments
|
|
|
|
@return a number of bytes written to a buffer *excluding* terminating '\0'
|
|
|
|
@post
|
|
The syntax of a format string is generally the same:
|
|
% <flag> <width> <precision> <length modifier> <format>
|
|
where everithing but the format is optional.
|
|
|
|
Three one-character flags are recognized:
|
|
'0' has the standard zero-padding semantics;
|
|
'-' is parsed, but silently ignored;
|
|
'`' (backtick) is only supported for strings (%s) and means that the
|
|
string will be quoted according to MySQL identifier quoting rules.
|
|
|
|
Both <width> and <precision> can be specified as numbers or '*'.
|
|
If an asterisk is used, an argument of type int is consumed.
|
|
|
|
<length modifier> can be 'l', 'll', or 'z'.
|
|
|
|
Supported formats are 's' (null pointer is accepted, printed as
|
|
"(null)"), 'b' (extension, see below), 'c', 'd', 'i', 'u', 'x', 'o',
|
|
'X', 'p' (works as 0x%x), 'f', 'g', 'M' (extension, see below).
|
|
|
|
Standard syntax for positional arguments $n is supported.
|
|
|
|
Extensions:
|
|
|
|
Flag '`' (backtick): see above.
|
|
|
|
Format 'b': binary buffer, prints exactly <precision> bytes from the
|
|
argument, without stopping at '\0'.
|
|
|
|
Format 'M': takes one integer, prints this integer, space, double quote
|
|
error message, double quote. In other words
|
|
printf("%M", n) === printf("%d \"%s\"", n, strerror(n))
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef MYSQL_ABI_CHECK
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
extern struct my_snprintf_service_st {
|
|
size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
|
|
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
|
|
} *my_snprintf_service;
|
|
|
|
#ifdef MYSQL_DYNAMIC_PLUGIN
|
|
|
|
#define my_vsnprintf my_snprintf_service->my_vsnprintf_type
|
|
#define my_snprintf my_snprintf_service->my_snprintf_type
|
|
|
|
#else
|
|
|
|
#ifndef ATTRIBUTE_FORMAT
|
|
#define ATTRIBUTE_FORMAT_DEFINED
|
|
#define ATTRIBUTE_FORMAT(A,B,C)
|
|
#endif
|
|
#ifdef MYSQL_ABI_CHECK
|
|
#undef ATTRIBUTE_FORMAT
|
|
#define ATTRIBUTE_FORMAT(A,B,C)
|
|
#endif
|
|
size_t my_snprintf(char* to, size_t n, const char* fmt, ...)
|
|
ATTRIBUTE_FORMAT(printf, 3, 4);
|
|
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
|
|
|
|
#ifdef ATTRIBUTE_FORMAT_DEFINED
|
|
#undef ATTRIBUTE_FORMAT_DEFINED
|
|
#undef ATTRIBUTE_FORMAT
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
|
|
#endif
|
|
|