← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-14 08:26:38 UTC
  • mto: (670.1.24 devel)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: dev@torum.net-20081214082638-c8uje8oiwk4s2dh0
First pass of replacing MySQL's strxmov with libc alternatives

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.cc
598
598
    end=convert_dirname(name, dir, NULL);
599
599
    if (dir[0] == FN_HOMELIB)           /* Add . to filenames in home */
600
600
      *end++='.';
601
 
    strxmov(end,config_file,ext,NULL);
 
601
    sprintf(end,"%s%s",config_file,ext);
602
602
  }
603
603
  else
604
604
  {
881
881
        end= convert_dirname(name, pos, NULL);
882
882
        if (name[0] == FN_HOMELIB)      /* Add . to filenames in home */
883
883
          *end++='.';
884
 
        strxmov(end, conf_file, *ext, " ", NULL);
 
884
  sprintf(end,"%s%s ",conf_file, *ext);
885
885
        fputs(name,stdout);
886
886
      }
887
887
    }