===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/distopt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rdist/distopt.c	2001/11/19 19:02:15	1.6
--- src/usr.bin/rdist/distopt.c	2003/04/05 20:31:58	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: distopt.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: distopt.c,v 1.7 2003/04/05 20:31:58 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 39,45 ****
  "$From: distopt.c,v 6.10 1996/01/30 01:52:07 mcooper Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: distopt.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
  #endif
  
  static char sccsid[] = "@(#)distopt.c";
--- 39,45 ----
  "$From: distopt.c,v 6.10 1996/01/30 01:52:07 mcooper Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: distopt.c,v 1.7 2003/04/05 20:31:58 deraadt Exp $";
  #endif
  
  static char sccsid[] = "@(#)distopt.c";
***************
*** 154,163 ****
  
  	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
  		if (buf[0] == CNULL)
! 			(void) strcpy(buf, distoptinfo[i].do_name);
  		else {
! 			(void) strcat(buf, ",");
! 			(void) strcat(buf, distoptinfo[i].do_name);
  		}
  	}
  
--- 154,165 ----
  
  	for (i = 0, buf[0] = CNULL; distoptinfo[i].do_name; ++i) {
  		if (buf[0] == CNULL)
! 			(void) strlcpy(buf, distoptinfo[i].do_name,
! 			    sizeof buf);
  		else {
! 			(void) strlcat(buf, ",", sizeof buf);
! 			(void) strlcat(buf, distoptinfo[i].do_name,
! 			    sizeof buf);
  		}
  	}
  
***************
*** 179,188 ****
  			continue;
  
  		if (buf[0] == CNULL)
! 			(void) strcpy(buf, distoptinfo[i].do_name);
  		else {
! 			(void) strcat(buf, ",");
! 			(void) strcat(buf, distoptinfo[i].do_name);
  		}
  	}
  
--- 181,192 ----
  			continue;
  
  		if (buf[0] == CNULL)
! 			(void) strlcpy(buf, distoptinfo[i].do_name,
! 			    sizeof buf);
  		else {
! 			(void) strlcat(buf, ",", sizeof buf);
! 			(void) strlcat(buf, distoptinfo[i].do_name,
! 			    sizeof buf);
  		}
  	}