← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_format.cc

  • Committer: Eric Herman
  • Date: 2008-12-06 22:37:37 UTC
  • mfrom: (656.1.6 devel)
  • mto: (656.1.8 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: eric@mysql.com-20081206223737-viem01l5uhm0w14r
merged from lp:drizzle/mordred

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_format.cc
89
89
      memmove(buff, name, length); /* Save name for last copy */
90
90
      name=buff;
91
91
    }
92
 
    pos= strncpy(my_stpcpy(to,dev),name,length) + length;
93
 
    (void) my_stpcpy(pos,ext);                  /* Don't convert extension */
 
92
    char *tmp= strcpy(to, dev) + strlen(dev);
 
93
    pos= strncpy(tmp,name,length) + length;
 
94
    (void) strcpy(pos,ext);                     /* Don't convert extension */
94
95
  }
95
96
  /*
96
97
    If MY_RETURN_REAL_PATH and MY_RESOLVE_SYMLINK is given, only do
101
102
                                   MY_RESOLVE_LINK: 0));
102
103
  else if (flag & MY_RESOLVE_SYMLINKS)
103
104
  {
104
 
    my_stpcpy(buff,to);
 
105
    strcpy(buff,to);
105
106
    (void) my_readlink(to, buff, MYF(0));
106
107
  }
107
108
  return(to);