===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/log.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/cvs/log.c	2008/04/24 19:13:56	1.43
--- src/usr.bin/cvs/log.c	2008/06/11 01:55:05	1.44
***************
*** 1,4 ****
! /*	$OpenBSD: log.c,v 1.43 2008/04/24 19:13:56 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: log.c,v 1.44 2008/06/11 01:55:05 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 129,164 ****
  
  	va_start(vap, fmt);
  
! 		ret = vasprintf(&nstr, fmt, vap);
! 		if (ret == -1)
! 			fatal("cvs_printf: could not allocate memory");
! 		for (dp = nstr; *dp != '\0';) {
! 			sp = strchr(dp, '\n');
! 			if (sp == NULL)
! 				for (sp = dp; *sp != '\0'; sp++)
! 					;
  
! 			if (cvs_server_active && send_m) {
! 				send_m = 0;
! 				putc('M', stdout);
! 				putc(' ', stdout);
! 			}
  
! 			if (dp != nstr && dp != sp &&
! 			    !strncmp(dp, LOG_REVSEP, sp - dp))
! 				putc('>', stdout);
  
! 			fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout);
  
! 			if (*sp != '\n')
! 				break;
  
! 			putc('\n', stdout);
! 			send_m = 1;
! 			dp = sp + 1;
! 		}
! 		xfree(nstr);
  
  	va_end(vap);
  	return (ret);
  }
--- 129,166 ----
  
  	va_start(vap, fmt);
  
! 	ret = vasprintf(&nstr, fmt, vap);
! 	if (ret == -1)
! 		fatal("cvs_printf: could not allocate memory");
  
! 	for (dp = nstr; *dp != '\0';) {
! 		sp = strchr(dp, '\n');
! 		if (sp == NULL)
! 			for (sp = dp; *sp != '\0'; sp++)
! 				;
  
! 		if (cvs_server_active && send_m) {
! 			send_m = 0;
! 			putc('M', stdout);
! 			putc(' ', stdout);
! 		}
  
! 		if (dp != nstr && dp != sp &&
! 		    !strncmp(dp, LOG_REVSEP, sp - dp))
! 			putc('>', stdout);
  
! 		fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout);
  
! 		if (*sp != '\n')
! 			break;
  
+ 		putc('\n', stdout);
+ 		send_m = 1;
+ 		dp = sp + 1;
+ 	}
+ 
+ 	xfree(nstr);
  	va_end(vap);
+ 
  	return (ret);
  }