← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_loadpath.c

Renamed strings to mystrings, for include/lib naming consistency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_loadpath.c
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include "mysys_priv.h"
17
 
#include <mystrings/m_string.h>
 
17
#include <m_string.h>
18
18
 
19
19
        /* Returns full load-path for a file. to may be = path */
20
20
        /* if path is a hard-path return path */
31
31
 
32
32
  if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
33
33
      test_if_hard_path(path))
34
 
    my_stpcpy(buff,path);
 
34
    VOID(strmov(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)
39
39
    if (is_cur)
40
40
      is_cur=2;                                 /* Remove current dir */
41
41
    if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
42
 
      strcat(buff,path+is_cur);
 
42
      VOID(strcat(buff,path+is_cur));
43
43
    else
44
 
      my_stpcpy(buff,path);                     /* Return org file name */
 
44
      VOID(strmov(buff,path));                  /* Return org file name */
45
45
  }
46
46
  else
47
 
    strxmov(buff,own_path_prefix,path,NULL);
48
 
  my_stpcpy(to,buff);
 
47
    VOID(strxmov(buff,own_path_prefix,path,NullS));
 
48
  strmov(to,buff);
49
49
  return(to);
50
50
} /* my_load_path */