← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_format.c

merging from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_format.c
88
88
      memcpy(buff, name, length); /* Save name for last copy */
89
89
      name=buff;
90
90
    }
91
 
    pos=strmake(strmov(to,dev),name,length);
92
 
    (void) strmov(pos,ext);                     /* Don't convert extension */
 
91
    pos=strmake(stpcpy(to,dev),name,length);
 
92
    (void) stpcpy(pos,ext);                     /* Don't convert extension */
93
93
  }
94
94
  /*
95
95
    If MY_RETURN_REAL_PATH and MY_RESOLVE_SYMLINK is given, only do
100
100
                                   MY_RESOLVE_LINK: 0));
101
101
  else if (flag & MY_RESOLVE_SYMLINKS)
102
102
  {
103
 
    strmov(buff,to);
 
103
    stpcpy(buff,to);
104
104
    (void) my_readlink(to, buff, MYF(0));
105
105
  }
106
106
  return(to);