← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_path.c

merging from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_path.c
64
64
    to=strend(to);
65
65
    if (to != start && to[-1] != FN_LIBCHAR)
66
66
      *to++ = FN_LIBCHAR;
67
 
    VOID(strmov(to,own_pathname_part));
 
67
    VOID(stpcpy(to,own_pathname_part));
68
68
  }
69
69
  return(start);
70
70
} /* my_path */
92
92
  {
93
93
    if (path != pos)
94
94
    {
95
 
      strxmov(strnmov(to,path,(uint) (pos-path)),dir,name,ext,NullS);
 
95
      strxmov(stpncpy(to,path,(uint) (pos-path)),dir,name,ext,NullS);
96
96
      if (!access(to,F_OK))
97
97
      {
98
98
        to[(uint) (pos-path)+1]=0;      /* Return path only */