← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_pack.cc

  • Committer: Monty Taylor
  • Date: 2008-12-11 07:51:00 UTC
  • mfrom: (670.3.3 remove-my-stpncpy)
  • mto: This revision was merged to the branch mainline in revision 672.
  • Revision ID: monty@inaugust.com-20081211075100-1jaqspnugi2u87u0
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_pack.cc
138
138
  if ((pos=strrchr(from_ptr,FN_DEVCHAR)) != 0)
139
139
  {                                             /* Skip device part */
140
140
    length=(size_t) (pos-from_ptr)+1;
141
 
    start=my_stpncpy(buff,from_ptr,length); from_ptr+=length;
 
141
    start= strncpy(buff,from_ptr,length);
 
142
    start+= strlen(from_ptr);
 
143
    from_ptr+=length;
142
144
  }
143
145
#endif
144
146
 
424
426
  if ((pos=strrchr(from_pos,FN_DEVCHAR)))       /* Skip device part */
425
427
  {
426
428
    pos++;
427
 
    to_pos=my_stpncpy(to,from_pos,(size_t) (pos-from_pos));
 
429
    to_pos= strncpy(to,from_pos,(size_t) (pos-from_pos));
 
430
    to_pos+= strlen(to);
428
431
    from_pos=pos;
429
432
  }
430
433
  else
457
460
        to_pos+= strlen(FN_C_PARENT_DIR);
458
461
      }
459
462
      else
460
 
        to_pos=my_stpncpy(to_pos,from_pos,(size_t) (pos-from_pos));
 
463
      {
 
464
        to_pos= strncpy(to_pos,from_pos,(size_t) (pos-from_pos));
 
465
        to_pos+= strlen(to_pos);
 
466
      }
461
467
      from_pos=pos+1;
462
468
    }
463
469
    *(to_pos++)=FN_C_AFTER_DIR;