← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.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/default.c
276
276
      return 1;
277
277
    if (insert_dynamic(ctx->args, (uchar*) &tmp))
278
278
      return 1;
279
 
    strmov(tmp, option);
 
279
    stpcpy(tmp, option);
280
280
  }
281
281
 
282
282
  return 0;
603
603
  }
604
604
  else
605
605
  {
606
 
    strmov(name,config_file);
 
606
    stpcpy(name,config_file);
607
607
  }
608
608
  fn_format(name,name,"","",4);
609
609
  {
744
744
    for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;
745
745
    if (!value)
746
746
    {
747
 
      strmake(strmov(option,"--"),ptr, (size_t) (end-ptr));
 
747
      strmake(stpcpy(option,"--"),ptr, (size_t) (end-ptr));
748
748
      if (opt_handler(handler_ctx, curr_gr, option))
749
749
        goto err;
750
750
    }
770
770
        value++;
771
771
        value_end--;
772
772
      }
773
 
      ptr=strnmov(strmov(option,"--"),ptr,(size_t) (end-ptr));
 
773
      ptr=stpncpy(stpcpy(option,"--"),ptr,(size_t) (end-ptr));
774
774
      *ptr++= '=';
775
775
 
776
776
      for ( ; value != value_end; value++)