===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/message.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/rdist/message.c	2001/11/19 19:02:15	1.10
--- src/usr.bin/rdist/message.c	2003/04/05 20:31:58	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: message.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: message.c,v 1.11 2003/04/05 20:31:58 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 39,45 ****
  "$From: message.c,v 6.24 1996/07/19 17:00:35 michaelc Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: message.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
  #endif
  
  static char sccsid[] = "@(#)common.c";
--- 39,45 ----
  "$From: message.c,v 6.24 1996/07/19 17:00:35 michaelc Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: message.c,v 1.11 2003/04/05 20:31:58 deraadt Exp $";
  #endif
  
  static char sccsid[] = "@(#)common.c";
***************
*** 279,285 ****
  		return("NULL message string");
  
  	/* strtok() is harmful */
! 	(void) strcpy(msgbuf, msgstr);
  
  	/*
  	 * Each <facility>=<types> list is separated by ":".
--- 279,285 ----
  		return("NULL message string");
  
  	/* strtok() is harmful */
! 	(void) strlcpy(msgbuf, msgstr, sizeof msgbuf);
  
  	/*
  	 * Each <facility>=<types> list is separated by ":".
***************
*** 464,478 ****
  		char *cp;
  		int fd;
  		char *getenv();
  
  		/*
  		 * Create and open a new temporary file
  		 */
  		if ((cp = getenv("TMPDIR")) == NULL)
  			cp = _PATH_TMP;
! 		tempfile = (char *) xmalloc(strlen(cp) + 1 + 
! 					    strlen(_RDIST_TMP) + 2);
! 		(void) sprintf(tempfile, "%s/%s", cp, _RDIST_TMP);
  
  		msgfac->mf_filename = tempfile;
  		if ((fd = mkstemp(msgfac->mf_filename)) == -1 ||
--- 464,479 ----
  		char *cp;
  		int fd;
  		char *getenv();
+ 		size_t len;
  
  		/*
  		 * Create and open a new temporary file
  		 */
  		if ((cp = getenv("TMPDIR")) == NULL)
  			cp = _PATH_TMP;
! 		len = strlen(cp) + 1 + strlen(_RDIST_TMP) + 2;
! 		tempfile = (char *) xmalloc(len);
! 		(void) snprintf(tempfile, len, "%s/%s", cp, _RDIST_TMP);
  
  		msgfac->mf_filename = tempfile;
  		if ((fd = mkstemp(msgfac->mf_filename)) == -1 ||
***************
*** 531,541 ****
  
  		checkhostname();
  		if (strncmp(currenthost, msgbuf, strlen(currenthost)) == 0)
! 			(void) strcpy(mbuf, msgbuf);
  		else
! 			(void) sprintf(mbuf, "%s: %s", currenthost, msgbuf);
  	} else
! 		(void) strcpy(mbuf, "");
  
  	/*
  	 * Special case for messages that only get
--- 532,543 ----
  
  		checkhostname();
  		if (strncmp(currenthost, msgbuf, strlen(currenthost)) == 0)
! 			(void) strlcpy(mbuf, msgbuf, sizeof mbuf);
  		else
! 			(void) snprintf(mbuf, sizeof mbuf,
! 			    "%s: %s", currenthost, msgbuf);
  	} else
! 		(void) strlcpy(mbuf, "", sizeof mbuf);
  
  	/*
  	 * Special case for messages that only get
***************
*** 596,602 ****
  	fmt = (char *) va_arg(args, char *);
  	va_end(args);
  
! 	(void) vsprintf(buf, fmt, args);
  
  	_message(lvl, buf);
  }
--- 598,604 ----
  	fmt = (char *) va_arg(args, char *);
  	va_end(args);
  
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  
  	_message(lvl, buf);
  }
***************
*** 612,618 ****
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_message(lvl, buf);
--- 614,620 ----
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_message(lvl, buf);
***************
*** 631,637 ****
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) sprintf(buf, fmt, a1, a2, a3, a4, a5);
  
  	_message(lvl, buf);
  }
--- 633,639 ----
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) snprintf(buf, sizeof buf, fmt, a1, a2, a3, a4, a5);
  
  	_message(lvl, buf);
  }
***************
*** 665,671 ****
  	fmt = (char *) va_arg(args, char *);
  	va_end(args);
  
! 	(void) vsprintf(buf, fmt, args);
  
  	_debugmsg(lvl, buf);
  }
--- 667,673 ----
  	fmt = (char *) va_arg(args, char *);
  	va_end(args);
  
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  
  	_debugmsg(lvl, buf);
  }
***************
*** 681,687 ****
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_debugmsg(lvl, buf);
--- 683,689 ----
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_debugmsg(lvl, buf);
***************
*** 699,705 ****
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) sprintf(buf, fmt, a1, a2, a3, a4, a5);
  
  	_debugmsg(lvl, buf);
  }
--- 701,707 ----
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) snprintf(buf, sizeof buf, fmt, a1, a2, a3, a4, a5);
  
  	_debugmsg(lvl, buf);
  }
***************
*** 718,726 ****
  
  	if (msg) {
  		if (isserver)
! 			(void) sprintf(buf, "REMOTE ERROR: %s", msg);
  		else
! 			(void) sprintf(buf, "LOCAL ERROR: %s", msg);
  	}
  
  	_message(MT_NERROR, (buf[0]) ? buf : NULL);
--- 720,728 ----
  
  	if (msg) {
  		if (isserver)
! 			(void) snprintf(buf, sizeof buf, "REMOTE ERROR: %s", msg);
  		else
! 			(void) snprintf(buf, sizeof buf, "LOCAL ERROR: %s", msg);
  	}
  
  	_message(MT_NERROR, (buf[0]) ? buf : NULL);
***************
*** 741,747 ****
  	va_start(args);
  	fmt = (char *) va_arg(args, char *);
  	if (fmt)
! 		(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_error((buf[0]) ? buf : NULL);
--- 743,749 ----
  	va_start(args);
  	fmt = (char *) va_arg(args, char *);
  	if (fmt)
! 		(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_error((buf[0]) ? buf : NULL);
***************
*** 760,766 ****
  	buf[0] = CNULL;
  	va_start(args, fmt);
  	if (fmt)
! 		(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_error((buf[0]) ? buf : NULL);
--- 762,768 ----
  	buf[0] = CNULL;
  	va_start(args, fmt);
  	if (fmt)
! 		(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_error((buf[0]) ? buf : NULL);
***************
*** 779,785 ****
  
  	buf[0] = CNULL;
  	if (fmt)
! 		(void) sprintf(buf, fmt, a1, a2, a3, a4, a5, a6);
  
  	_error((buf[0]) ? buf : NULL);
  }
--- 781,787 ----
  
  	buf[0] = CNULL;
  	if (fmt)
! 		(void) snprintf(buf, sizeof buf, fmt, a1, a2, a3, a4, a5, a6);
  
  	_error((buf[0]) ? buf : NULL);
  }
***************
*** 796,804 ****
  	++nerrs;
  
  	if (isserver)
! 		(void) sprintf(buf, "REMOTE ERROR: %s", msg);
  	else
! 		(void) sprintf(buf, "LOCAL ERROR: %s", msg);
  
  	_message(MT_FERROR, buf);
  
--- 798,806 ----
  	++nerrs;
  
  	if (isserver)
! 		(void) snprintf(buf, sizeof buf, "REMOTE ERROR: %s", msg);
  	else
! 		(void) snprintf(buf, sizeof buf, "LOCAL ERROR: %s", msg);
  
  	_message(MT_FERROR, buf);
  
***************
*** 818,824 ****
  
  	va_start(args);
  	fmt = (char *) va_arg(args, char *);
! 	(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_fatalerr(buf);
--- 820,826 ----
  
  	va_start(args);
  	fmt = (char *) va_arg(args, char *);
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_fatalerr(buf);
***************
*** 835,841 ****
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsprintf(buf, fmt, args);
  	va_end(args);
  
  	_fatalerr(buf);
--- 837,843 ----
  	va_list args;
  
  	va_start(args, fmt);
! 	(void) vsnprintf(buf, sizeof buf, fmt, args);
  	va_end(args);
  
  	_fatalerr(buf);
***************
*** 852,858 ****
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) sprintf(buf, fmt, a1, a2, a3, a4, a5);
  
  	_fatalerr(buf);
  }
--- 854,860 ----
  {
  	static char buf[MSGBUFSIZ];
  
! 	(void) snprintf(buf, sizeof buf, fmt, a1, a2, a3, a4, a5);
  
  	_fatalerr(buf);
  }