More cleanup for 10.2 integration

CMakeLists.txt

@@ -19,6 +19,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 ENDIF()
 IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0022 NEW)
+  CMAKE_POLICY(SET CMP0023 NEW)
 ENDIF()
 
 #Allow access to non existing targets  

client/ma_plugin_info.c

@@ -115,8 +115,10 @@ static void show_file(char *filename)
   char *has_so_ext= strstr(filename, SO_EXT);
 
   if (!strchr(filename, FN_LIBCHAR))
-    strxnmov(dlpath, sizeof(dlpath) - 1,
-             (env_plugin_dir) ? env_plugin_dir : PLUGINDIR, "/", filename, has_so_ext ? "" : SO_EXT, NullS);
+    snprintf(dlpath, sizeof(dlpath) - 1, "%s/%s%s",
+             (env_plugin_dir) ? env_plugin_dir : PLUGINDIR, 
+             filename, 
+             has_so_ext ? "" : SO_EXT);
   else
     strcpy(dlpath, filename);
   if ((dlhandle= dlopen((const char *)dlpath, RTLD_NOW)))

include/m_string.h

@@ -88,6 +88,10 @@ extern "C" {
 
 #if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread)
 #define strmov(A,B) stpcpy((A),(B))
+#define strnmov(A,B,C) stpncpy((A),(B),(C))
+#else
+#define strmov(A,B) (strcpy((A),(B)) + strlen((B));
+#define strnmov(A,B,C) (strncpy((A),(B),(C)) + strlen((B));
 #endif
 
 extern char NEAR _dig_vec[];		/* Declared in int2str() */
@@ -139,7 +143,7 @@ extern	void bmove_upp(char *dst,const char *src, size_t len);
 extern	void bchange(char *dst, size_t old_len, const char *src,
 		     size_t new_len, size_t tot_len);
 extern	void strappend(char *s,size_t len,pchar fill);
-extern	char *strend(const char *s);
+#define strend(s) strchr((s),'\0')
 extern  char *strcend(const char *, char);
 extern	char *strfield(char *src,int fields,int chars,int blanks,
 			   int tabch);
@@ -152,10 +156,6 @@ extern	char *strmake(char *dst,const char *src, size_t length);
 extern	char *strmake_overlapp(char *dst,const char *src, size_t length);
 #endif
 
-#ifndef strmov
-extern	char *strmov(char *dst,const char *src);
-#endif
-extern	char *strnmov(char *dst,const char *src,uint n);
 extern	char *strsuff(const char *src,const char *suffix);
 extern	char *strcont(const char *src,const char *set);
 extern	char *strxcat _VARARGS((char *dst,const char *src, ...));

include/my_sys.h

@@ -119,14 +119,7 @@ extern int NEAR my_errno;		/* Last error in mysys */
 #define TERMINATE(A) {}
 #define QUICK_SAFEMALLOC
 #define NORMAL_SAFEMALLOC
-extern gptr ma_malloc(size_t Size,myf MyFlags);
 #define ma_malloc_ci(SZ,FLAG) ma_malloc( SZ, FLAG )
-extern gptr ma_realloc(gptr oldpoint, size_t Size,myf MyFlags);
-extern void my_no_flags_free(void *ptr);
-extern gptr ma_memdup(const unsigned char *from, size_t length,myf MyFlags);
-extern my_string ma_strdup(const char *from,myf MyFlags);
-extern my_string ma_strndup(const char *from, size_t length, myf MyFlags);
-#define ma_free(PTR) my_no_flags_free(PTR)
 #define CALLER_INFO_PROTO   /* nothing */
 #define CALLER_INFO         /* nothing */
 #define ORIG_CALLER_INFO    /* nothing */
@@ -423,10 +416,6 @@ extern gptr _myrealloc(gptr pPtr,size_t uSize,const char *sFile,
 extern gptr my_multi_malloc _VARARGS((myf MyFlags, ...));
 extern void _myfree(gptr pPtr,const char *sFile,uint uLine, myf MyFlag);
 extern int _sanity(const char *sFile,unsigned int uLine);
-extern gptr _ma_memdup(const unsigned char *from, size_t length,
-		       const char *sFile, uint uLine,myf MyFlag);
-extern my_string _ma_strdup(const char *from, const char *sFile, uint uLine,
-			    myf MyFlag);
 #ifndef TERMINATE
 extern void TERMINATE(FILE *file);
 #endif

libmariadb/CMakeLists.txt

@@ -291,7 +291,6 @@ mf_pack.c
 mf_path.c
 mf_unixpath.c
 mf_wcomp.c
-mulalloc.c 
 my_alloc.c
 my_compress.c
 my_context.c
@@ -302,13 +301,11 @@ my_fstream.c
 my_getwd.c
 my_init.c
 my_lib.c
-my_malloc.c
 my_messnc.c
 my_net.c
 my_once.c
 my_port.c 
 my_pthread.c
-my_realloc.c
 my_seek.c
 my_static.c
 my_symlink.c
@@ -317,19 +314,9 @@ my_write.c
 mysql_async.c
 password.c 
 str2int.c
-strcend.c
-strcont.c 
-strend.c
-strfill.c
 string.c
-strinstr.c
-strmake.c
-strmov.c
-strnmov.c
 strtoll.c
 strtoull.c 
-strxmov.c
-strxnmov.c
 thr_mutex.c
 typelib.c
 sha1.c

libmariadb/array.c

@@ -21,6 +21,7 @@
 
 #include "mysys_priv.h"
 #include "m_string.h"
+#include <memory.h>
 
 /*
   Initiate array and alloc space for init_alloc elements. Array is usable
@@ -44,7 +45,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
   array->max_element=init_alloc;
   array->alloc_increment=alloc_increment;
   array->size_of_element=element_size;
-  if (!(array->buffer=(char*) ma_malloc_ci(element_size*init_alloc,MYF(MY_WME))))
+  if (!(array->buffer=(char*) malloc(element_size*init_alloc)))
   {
     array->max_element=0;
     DBUG_RETURN(TRUE);
@@ -78,10 +79,9 @@ unsigned char *ma_alloc_dynamic(DYNAMIC_ARRAY *array)
   if (array->elements == array->max_element)
   {
     char *new_ptr;
-    if (!(new_ptr=(char*) ma_realloc(array->buffer,(array->max_element+
-				     array->alloc_increment)*
-				     array->size_of_element,
-				     MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
+    if (!(new_ptr=(char*) realloc(array->buffer,(array->max_element+
+			          array->alloc_increment)*
+				   array->size_of_element)))
       return 0;
     array->buffer=new_ptr;
     array->max_element+=array->alloc_increment;
@@ -110,9 +110,8 @@ my_bool ma_set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx)
       char *new_ptr;
       size=(idx+array->alloc_increment)/array->alloc_increment;
       size*= array->alloc_increment;
-      if (!(new_ptr=(char*) ma_realloc(array->buffer,size*
-				       array->size_of_element,
-				       MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
+      if (!(new_ptr=(char*) realloc(array->buffer,size*
+			            array->size_of_element)))
 	return TRUE;
       array->buffer=new_ptr;
       array->max_element=size;
@@ -145,7 +144,7 @@ void ma_delete_dynamic(DYNAMIC_ARRAY *array)
 {
   if (array->buffer)
   {
-    ma_free(array->buffer);
+    free(array->buffer);
     array->buffer=0;
     array->elements=array->max_element=0;
   }
@@ -167,9 +166,8 @@ void ma_freeze_size(DYNAMIC_ARRAY *array)
 
   if (array->buffer && array->max_element != elements)
   {
-    array->buffer=(char*) ma_realloc(array->buffer,
-				     elements*array->size_of_element,
-				     MYF(MY_WME));
+    array->buffer=(char*) realloc(array->buffer,
+			          elements*array->size_of_element);
     array->max_element=elements;
   }
 }

libmariadb/client_plugin.c.in

@@ -250,16 +250,16 @@ static void load_env_plugins(MYSQL *mysql)
   if (!s)
     return;
 
-  free_env= plugs= ma_strdup(s, MYF(MY_WME));
+  free_env= plugs= strdup(s);
 
   do {
-    if ((s= strchr(plugs, ';')))
+    if (s= strchr(plugs, ';'))
       *s= '\0';
     mysql_load_plugin(mysql, plugs, -1, 0);
     plugs= s + 1;
   } while (s);
 
-  ma_free(free_env);
+  free(free_env);
 }
 
 /********** extern functions to be used by libmariadb *********************/
@@ -391,11 +391,11 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
   }
 
   /* Compile dll path */
-  strxnmov(dlpath, sizeof(dlpath) - 1,
+  snprintf(dlpath, sizeof(dlpath) - 1, "%s/%s%s",
            mysql->options.extension && mysql->options.extension->plugin_dir ?
            mysql->options.extension->plugin_dir : (env_plugin_dir) ? env_plugin_dir :
            PLUGINDIR, "/",
-           name, SO_EXT, NullS);
+           name, SO_EXT);
 
   /* Open new dll handle */
   if (!(dlhandle= dlopen((const char *)dlpath, RTLD_NOW)))

libmariadb/dbug.c

@@ -99,6 +99,7 @@
 #include <process.h>
 #else
 #include <signal.h>
+#include <sys/time.h>
 #endif
 
 extern int ma_snprintf(char* to, size_t n, const char* fmt, ...);
@@ -2032,7 +2033,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
       cs->stack->name[len]=0;
     }
     else
-    strmov(cs->stack->name,name);
+    strcpy(cs->stack->name,name);
     name=cs->stack->name;
     if (strcmp(name, "-") == 0)
     {

libmariadb/default.c

@@ -237,15 +237,15 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MA_MEM_ROOT *alloc,
       return 0;					/* Ignore wrong paths */
     if (dir)
     {
-      strmov(name,dir);
+      strcpy(name,dir);
       convert_dirname(name);
       if (dir[0] == FN_HOMELIB)		/* Add . to filenames in home */
         strcat(name,".");
-      strxmov(strend(name),config_file,ext,NullS);
+      strcat(strcat(name, config_file), ext);
     }
     else
     {
-      strmov(name,config_file);
+      strcpy(name,config_file);
     }
     fn_format(name,name,"","",4);
 #if !defined(_WIN32) && !defined(OS2)
@@ -261,7 +261,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MA_MEM_ROOT *alloc,
       }
     }
 #endif
-    if (!(file = ma_open(fn_format(name,name,"","",4),"r", NULL)))
+    if (!(file = ma_open(name,"r", NULL)))
       return 0;
   }
   else {
@@ -307,13 +307,13 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MA_MEM_ROOT *alloc,
     if (!read_values)
       continue;
     if (!(end=value=strchr(ptr,'=')))
-      end=strend(ptr);				/* Option without argument */
+      end=strchr(ptr, '\0');				/* Option without argument */
     for ( ; isspace(end[-1]) ; end--) ;
     if (!value)
     {
       if (!(tmp=ma_alloc_root(alloc,(uint) (end-ptr)+3)))
 	goto err;
-      strmake(strmov(tmp,"--"),ptr,(uint) (end-ptr));
+      strncpy(strmov(tmp,"--"),ptr,(uint) (end-ptr));
       if (ma_insert_dynamic(args,(gptr) &tmp))
 	goto err;
     }
@@ -322,7 +322,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MA_MEM_ROOT *alloc,
       /* Remove pre- and end space */
       char *value_end;
       for (value++ ; isspace(*value); value++) ;
-      value_end=strend(value);
+      value_end=strchr(value, '\0');
       for ( ; isspace(value_end[-1]) ; value_end--) ;
       /* remove possible quotes */
       if (*value == '\'' || *value == '\"')
@@ -414,15 +414,15 @@ void ma_print_defaults(const char *conf_file, const char **groups)
     for (dirs=default_directories ; *dirs; dirs++)
     {
       if (**dirs)
-	strmov(name,*dirs);
+	strcpy(name,*dirs);
       else if (defaults_extra_file)
-	strmov(name,defaults_extra_file);
+	strcpy(name,defaults_extra_file);
       else
 	continue;
       convert_dirname(name);
       if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
 	strcat(name,".");
-      strxmov(strend(name),conf_file,default_ext," ",NullS);
+      strcat(strcat(strcat(name, conf_file), default_ext), " ");
       fputs(name,stdout);
     }
     puts("");