← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_format.c

Merged current state of use-replace-funcs.

Show diffs side-by-side

added added

removed removed

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