1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov 2009-12-24 11:00:04 +02:00
commit c248859ec8
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -4195,7 +4195,7 @@ char *get_arg(char *line, my_bool get_next_arg)
if (*ptr == '\\' && ptr[1]) // escaped character if (*ptr == '\\' && ptr[1]) // escaped character
{ {
// Remove the backslash // Remove the backslash
strmov(ptr, ptr+1); strmov_overlapp(ptr, ptr+1);
} }
else if ((!quoted && *ptr == ' ') || (quoted && *ptr == qtype)) else if ((!quoted && *ptr == ' ') || (quoted && *ptr == qtype))
{ {

9
include/m_string.h
View File

@ -95,9 +95,7 @@ extern char NEAR _dig_vec_lower[];
/* Defined in strtod.c */ /* Defined in strtod.c */
extern const double log_10[309]; extern const double log_10[309];
#ifdef BAD_STRING_COMPILER #ifndef strmov
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)
#else
#define strmov_overlapp(A,B) strmov(A,B) #define strmov_overlapp(A,B) strmov(A,B)
#define strmake_overlapp(A,B,C) strmake(A,B,C) #define strmake_overlapp(A,B,C) strmake(A,B,C)
#endif #endif
@ -155,12 +153,11 @@ extern size_t strinstr(const char *str,const char *search);
extern size_t r_strinstr(const char *str, size_t from, const char *search); extern size_t r_strinstr(const char *str, size_t from, const char *search);
extern char *strkey(char *dst,char *head,char *tail,char *flags); extern char *strkey(char *dst,char *head,char *tail,char *flags);
extern char *strmake(char *dst,const char *src,size_t length); extern char *strmake(char *dst,const char *src,size_t length);
#ifndef strmake_overlapp
extern char *strmake_overlapp(char *dst,const char *src, size_t length);
#endif
#ifndef strmov #ifndef strmov
extern char *strmov(char *dst,const char *src); extern char *strmov(char *dst,const char *src);
#else
extern char *strmov_overlapp(char *dst,const char *src);
#endif #endif
extern char *strnmov(char *dst,const char *src,size_t n); extern char *strnmov(char *dst,const char *src,size_t n);
extern char *strsuff(const char *src,const char *suffix); extern char *strsuff(const char *src,const char *suffix);

6
strings/strmov.c
View File

@ -24,13 +24,11 @@
#include <my_global.h> #include <my_global.h>
#include "m_string.h" #include "m_string.h"
#ifdef BAD_STRING_COMPILER #ifdef strmov
#undef strmov #undef strmov
#define strmov strmov_overlapp #define strmov strmov_overlapp
#endif #endif
#ifndef strmov
#if !defined(MC68000) && !defined(DS90) #if !defined(MC68000) && !defined(DS90)
char *strmov(register char *dst, register const char *src) char *strmov(register char *dst, register const char *src)
@ -53,5 +51,3 @@ char *strmov(dst, src)
} }
#endif #endif
#endif /* strmov */