Merge lp:~elambert/drizzle/rm_my_symlink into lp:~drizzle-trunk/drizzle/7.2-staging

[Eric Lambert]

[Eric Lambert (elambert)]

removed calls to functions defined within mysys/my_symlink and replaced the calls with the corresponding posix functions.

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2009-05-22 17:13:38 +0000
+++ client/drizzle.cc	2009-06-12 23:11:27 +0000
@@ -1292,12 +1292,16 @@
       if (histfile)
         sprintf(histfile,"%s/.drizzle_history",getenv("HOME"));
       char link_name[FN_REFLEN];
-      if (my_readlink(link_name, histfile, 0) == 0 &&
-          strncmp(link_name, "/dev/null", 10) == 0)
+      ssize_t sym_link_size= readlink(histfile,link_name,FN_REFLEN-1);
+      if (sym_link_size >= 0)
       {
-        /* The .drizzle_history file is a symlink to /dev/null, don't use it */
-        free(histfile);
-        histfile= 0;
+        link_name[sym_link_size]= '\0';
+        if (strncmp(link_name, "/dev/null", 10) == 0)
+        {
+          /* The .drizzle_history file is a symlink to /dev/null, don't use it */
+          free(histfile);
+          histfile= 0;
+        }
       }
     }
     if (histfile)

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2009-06-05 23:29:08 +0000
+++ drizzled/drizzled.cc	2009-06-16 01:36:01 +0000
@@ -3128,12 +3128,19 @@
 
 static void fix_paths(void)
 {
-  char buff[FN_REFLEN],*pos;
+  char buff[FN_REFLEN],*pos,rp_buff[PATH_MAX];
   convert_dirname(drizzle_home,drizzle_home,NULL);
   /* Resolve symlinks to allow 'drizzle_home' to be a relative symlink */
-  my_realpath(drizzle_home,drizzle_home,MYF(0));
+#if defined(HAVE_BROKEN_REALPATH)
+   my_load_path(drizzle_home, drizzle_home, NULL);
+#else
+  if (!realpath(drizzle_home,rp_buff))
+    my_load_path(rp_buff, drizzle_home, NULL);
+  rp_buff[FN_REFLEN-1]= '\0';
+  strcpy(drizzle_home,rp_buff);
   /* Ensure that drizzle_home ends in FN_LIBCHAR */
   pos= strchr(drizzle_home, '\0');
+#endif
   if (pos[-1] != FN_LIBCHAR)
   {
     pos[0]= FN_LIBCHAR;

=== modified file 'mysys/mf_format.cc'
--- mysys/mf_format.cc	2009-04-17 21:01:47 +0000
+++ mysys/mf_format.cc	2009-06-16 01:36:01 +0000
@@ -96,12 +96,24 @@
     realpath if the file is a symbolic link
   */
   if (flag & MY_RETURN_REAL_PATH)
-    (void) my_realpath(to, to, MYF(flag & MY_RESOLVE_SYMLINKS ?
-				   MY_RESOLVE_LINK: 0));
+  {
+    struct stat stat_buff;
+    char rp_buff[PATH_MAX];
+    if ((!flag & MY_RESOLVE_SYMLINKS) || 
+       (!lstat(to,&stat_buff)) && S_ISLNK(stat_buff.st_mode))
+    {
+      if (!realpath(to,rp_buff))
+        my_load_path(rp_buff, to, NULL);
+      rp_buff[FN_REFLEN-1]= '\0';
+      strcpy(to,rp_buff);
+    }
+  }
   else if (flag & MY_RESOLVE_SYMLINKS)
   {
     strcpy(buff,to);
-    (void) my_readlink(to, buff, MYF(0));
+    ssize_t sym_link_size= readlink(buff,to,FN_REFLEN-1);
+    if (sym_link_size >= 0)
+      to[sym_link_size]= '\0';
   }
   return(to);
 } /* fn_format */

=== modified file 'mysys/my_symlink.cc'
--- mysys/my_symlink.cc	2009-05-24 18:17:38 +0000
+++ mysys/my_symlink.cc	2009-06-16 01:36:01 +0000
@@ -17,128 +17,6 @@
 #include "mysys/mysys_err.h"
 #include <mystrings/m_string.h>
 #include <errno.h>
-#ifdef HAVE_REALPATH
-#include <sys/param.h>
-#include <sys/stat.h>
-#endif
-
-/*
-  Reads the content of a symbolic link
-  If the file is not a symbolic link, return the original file name in to.
-
-  RETURN
-    0  If filename was a symlink,    (to will be set to value of symlink)
-    1  If filename was a normal file (to will be set to filename)
-   -1  on error.
-*/
-
-int my_readlink(char *to, const char *filename, myf MyFlags)
-{
-#ifndef HAVE_READLINK
-  strcpy(to,filename);
-  return 1;
-#else
-  int result=0;
-  int length;
-
-  if ((length=readlink(filename, to, FN_REFLEN-1)) < 0)
-  {
-    /* Don't give an error if this wasn't a symlink */
-    if ((my_errno=errno) == EINVAL)
-    {
-      result= 1;
-      strcpy(to,filename);
-    }
-    else
-    {
-      if (MyFlags & MY_WME)
-	my_error(EE_CANT_READLINK, MYF(0), filename, errno);
-      result= -1;
-    }
-  }
-  else
-    to[length]=0;
-  return(result);
-#endif /* HAVE_READLINK */
-}
-
-
-/* Create a symbolic link */
-
-int my_symlink(const char *content, const char *linkname, myf MyFlags)
-{
-#ifndef HAVE_READLINK
-  return 0;
-#else
-  int result;
-
-  result= 0;
-  if (symlink(content, linkname))
-  {
-    result= -1;
-    my_errno=errno;
-    if (MyFlags & MY_WME)
-      my_error(EE_CANT_SYMLINK, MYF(0), linkname, content, errno);
-  }
-  else if ((MyFlags & MY_SYNC_DIR) && my_sync_dir_by_file(linkname, MyFlags))
-    result= -1;
-  return(result);
-#endif /* HAVE_READLINK */
-}
-
-/*
-  Resolve all symbolic links in path
-  'to' may be equal to 'filename'
-
-  Because purify gives a lot of UMR errors when using realpath(),
-  this code is disabled when using purify.
-
-  If MY_RESOLVE_LINK is given, only do realpath if the file is a link.
-*/
-
-#if defined(SCO)
-#define BUFF_LEN 4097
-#elif defined(MAXPATHLEN)
-#define BUFF_LEN MAXPATHLEN
-#else
-#define BUFF_LEN FN_LEN
-#endif
-
-int my_realpath(char *to, const char *filename, myf MyFlags)
-{
-#if defined(HAVE_REALPATH) &&  !defined(HAVE_BROKEN_REALPATH)
-  int result=0;
-  char buff[BUFF_LEN];
-  struct stat stat_buff;
-
-  if (!(MyFlags & MY_RESOLVE_LINK) ||
-      (!lstat(filename,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
-  {
-    char *ptr;
-    if ((ptr=realpath(filename,buff)))
-    {
-      strncpy(to,ptr,FN_REFLEN-1);
-    }
-    else
-    {
-      /*
-	Realpath didn't work;  Use my_load_path() which is a poor substitute
-	original name but will at least be able to resolve paths that starts
-	with '.'.
-      */
-      my_errno=errno;
-      if (MyFlags & MY_WME)
-	my_error(EE_REALPATH, MYF(0), filename, my_errno);
-      my_load_path(to, filename, NULL);
-      result= -1;
-    }
-  }
-  return(result);
-#else
-  my_load_path(to, filename, NULL);
-  return 0;
-#endif
-}
 
 bool test_if_hard_path(const char *dir_name)
 {

=== modified file 'mysys/my_symlink2.cc'
--- mysys/my_symlink2.cc	2009-04-17 21:01:47 +0000
+++ mysys/my_symlink2.cc	2009-06-16 01:36:01 +0000
@@ -32,6 +32,7 @@
   /* Test if we should create a link */
   int create_link;
   char abs_linkname[FN_REFLEN];
+  char rp_buff[PATH_MAX];
 
   if (my_disable_symlinks)
   {
@@ -43,7 +44,12 @@
   else
   {
     if (linkname)
-      my_realpath(abs_linkname, linkname, MYF(0));
+    {
+      if (!realpath(linkname,rp_buff))
+        my_load_path(rp_buff, linkname, NULL);
+      rp_buff[FN_REFLEN-1]= '\0';
+      strcpy(abs_linkname,rp_buff);
+    }
     create_link= (linkname && strcmp(abs_linkname,filename));
   }
 
@@ -71,7 +77,7 @@
       if (MyFlags & MY_DELETE_OLD)
 	my_delete(linkname, MYF(0));
       /* Create link */
-      if (my_symlink(filename, linkname, MyFlags))
+      if (symlink(filename,linkname))
       {
 	/* Fail, remove everything we have done */
 	tmp_errno=my_errno;
@@ -80,6 +86,8 @@
 	file= -1;
 	my_errno=tmp_errno;
       }
+      else if (MyFlags & MY_SYNC_DIR)
+        my_sync_dir_by_file(linkname, MyFlags);
     }
   }
   return(file);
@@ -93,14 +101,17 @@
 int my_delete_with_symlink(const char *name, myf MyFlags)
 {
   char link_name[FN_REFLEN];
-  int was_symlink= (!my_disable_symlinks &&
-		    !my_readlink(link_name, name, MYF(0)));
+  ssize_t sym_link_size= readlink(name,link_name,FN_REFLEN-1);
+  int was_symlink= (!my_disable_symlinks && sym_link_size != -1);
   int result;
 
   if (!(result=my_delete(name, MyFlags)))
   {
     if (was_symlink)
-      result=my_delete(link_name, MyFlags);
+    {
+      link_name[sym_link_size]= '\0';
+      result= my_delete(link_name, MyFlags);
+    }
   }
   return(result);
 }
@@ -121,13 +132,16 @@
   return my_rename(from, to, MyFlags);
 #else
   char link_name[FN_REFLEN], tmp_name[FN_REFLEN];
+  int sym_link_size= -1;
   int was_symlink= (!my_disable_symlinks &&
-		    !my_readlink(link_name, from, MYF(0)));
+                   (sym_link_size= readlink(from,link_name,FN_REFLEN-1)) != -1);
   int result=0;
   int name_is_different;
 
   if (!was_symlink)
     return(my_rename(from, to, MyFlags));
+  else
+    link_name[sym_link_size]= '\0';
 
   /* Change filename that symlink pointed to */
   strcpy(tmp_name, to);
@@ -142,8 +156,10 @@
   }
 
   /* Create new symlink */
-  if (my_symlink(tmp_name, to, MyFlags))
+  if (symlink(tmp_name, to))
     return(1);
+  else if (MyFlags & MY_SYNC_DIR)
+    my_sync_dir_by_file(to, MyFlags);
 
   /*
     Rename symlinked file if the base name didn't change.

=== modified file 'mysys/my_sys.h'
--- mysys/my_sys.h	2009-05-26 20:45:27 +0000
+++ mysys/my_sys.h	2009-06-15 16:15:04 +0000
@@ -300,14 +300,12 @@
 extern int my_close(File Filedes,myf MyFlags);
 extern File my_dup(File file, myf MyFlags);
 extern int my_mkdir(const char *dir, int Flags, myf MyFlags);
-extern int my_readlink(char *to, const char *filename, myf MyFlags);
 extern int my_realpath(char *to, const char *filename, myf MyFlags);
 extern File my_create_with_symlink(const char *linkname, const char *filename,
 				   int createflags, int access_flags,
 				   myf MyFlags);
 extern int my_delete_with_symlink(const char *name, myf MyFlags);
 extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags);
-extern int my_symlink(const char *content, const char *linkname, myf MyFlags);
 extern size_t my_read(File Filedes,unsigned char *Buffer,size_t Count,myf MyFlags);
 extern int my_rename(const char *from,const char *to,myf MyFlags);
 extern size_t my_write(File Filedes,const unsigned char *Buffer,size_t Count,

=== modified file 'plugin/archive/ha_archive.cc'
--- plugin/archive/ha_archive.cc	2009-06-08 01:32:13 +0000
+++ plugin/archive/ha_archive.cc	2009-06-15 16:15:04 +0000
@@ -578,7 +578,7 @@
   }
 
   if (linkname[0])
-    my_symlink(name_buff, linkname, MYF(0));
+    symlink(name_buff, linkname);
   fn_format(name_buff, table_name, "", ".frm",
 	    MY_REPLACE_EXT | MY_UNPACK_FILENAME);
 
@@ -1183,8 +1183,11 @@
     create_info->auto_increment_value= stats.auto_increment_value;
   }
 
-  if (!(my_readlink(share->real_path, share->data_file_name, MYF(0))))
+  ssize_t sym_link_size= readlink(share->data_file_name,share->real_path,FN_REFLEN-1);
+  if (sym_link_size >= 0) {
+    share->real_path[sym_link_size]= '\0';
     create_info->data_file_name= share->real_path;
+  }
 
   return;
 }

=== modified file 'plugin/myisam/mi_open.cc'
--- plugin/myisam/mi_open.cc	2009-03-28 06:09:15 +0000
+++ plugin/myisam/mi_open.cc	2009-06-16 01:36:01 +0000
@@ -68,7 +68,7 @@
   uint32_t i,j,len,errpos,head_length,base_pos,offset,info_length,keys,
     key_parts,unique_key_parts,fulltext_keys,uniques;
   char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN],
-       data_name[FN_REFLEN];
+       data_name[FN_REFLEN], rp_buff[PATH_MAX];
   unsigned char *disk_cache= NULL;
   unsigned char *disk_pos, *end_pos;
   MI_INFO info,*m_info,*old_info;
@@ -83,8 +83,11 @@
   head_length=sizeof(share_buff.state.header);
   memset(&info, 0, sizeof(info));
 
-  my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,
-                                   MY_UNPACK_FILENAME),MYF(0));
+  (void)fn_format(org_name,name,"",MI_NAME_IEXT, MY_UNPACK_FILENAME);
+  if (!realpath(org_name,rp_buff))
+    my_load_path(rp_buff,org_name, NULL);
+  rp_buff[FN_REFLEN-1]= '\0';
+  strcpy(name_buff,rp_buff);
   pthread_mutex_lock(&THR_LOCK_myisam);
   if (!(old_info=test_if_reopen(name_buff)))
   {
@@ -134,8 +137,10 @@
       goto err;
     }
     /* Don't call realpath() if the name can't be a link */
-    if (!strcmp(name_buff, org_name) ||
-        my_readlink(index_name, org_name, MYF(0)) == -1)
+    ssize_t sym_link_size= readlink(org_name,index_name,FN_REFLEN-1);
+    if (sym_link_size >= 0 )
+      index_name[sym_link_size]= '\0';
+    if (!strcmp(name_buff, org_name) || sym_link_size == -1)
       (void) strcpy(index_name, org_name);
     *strrchr(org_name, '.')= '\0';
     (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,