← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_loadpath.c

  • Committer: Brian Aker
  • Date: 2008-08-09 21:43:24 UTC
  • mfrom: (279.1.4 codestyle)
  • Revision ID: brian@tangent.org-20080809214324-jy2c15bx49naddsf
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_loadpath.c
31
31
 
32
32
  if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
33
33
      test_if_hard_path(path))
34
 
    VOID(strmov(buff,path));
 
34
    VOID(stpcpy(buff,path));
35
35
  else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
36
36
           (is_prefix(path,FN_PARENTDIR)) ||
37
37
           ! own_path_prefix)
41
41
    if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
42
42
      VOID(strcat(buff,path+is_cur));
43
43
    else
44
 
      VOID(strmov(buff,path));                  /* Return org file name */
 
44
      VOID(stpcpy(buff,path));                  /* Return org file name */
45
45
  }
46
46
  else
47
47
    VOID(strxmov(buff,own_path_prefix,path,NullS));
48
 
  strmov(to,buff);
 
48
  stpcpy(to,buff);
49
49
  return(to);
50
50
} /* my_load_path */