← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_loadpath.cc

  • Committer: Monty Taylor
  • Date: 2009-01-30 21:02:37 UTC
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090130210237-3n6ld8a9jc084jko
Commented out a test in subselect_sj - I think it might be a regression. Jay?

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_loadpath.cc
31
31
 
32
32
  if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
33
33
      test_if_hard_path(path))
34
 
    VOID(stpcpy(buff,path));
 
34
    strcpy(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)
38
38
  {
39
39
    if (is_cur)
40
40
      is_cur=2;                                 /* Remove current dir */
41
 
    if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
42
 
      VOID(strcat(buff,path+is_cur));
 
41
    if (! getcwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur)))
 
42
      strcat(buff,path+is_cur);
43
43
    else
44
 
      VOID(stpcpy(buff,path));                  /* Return org file name */
 
44
      strcpy(buff,path);                        /* Return org file name */
45
45
  }
46
46
  else
47
 
    VOID(strxmov(buff,own_path_prefix,path,NullS));
48
 
  stpcpy(to,buff);
 
47
    sprintf(buff,"%s%s",own_path_prefix,path);
 
48
  strcpy(to,buff);
49
49
  return(to);
50
50
} /* my_load_path */