===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/log.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/cvs/log.c	2006/05/27 03:30:30	1.35
--- src/usr.bin/cvs/log.c	2006/07/07 17:37:17	1.36
***************
*** 1,4 ****
! /*	$OpenBSD: log.c,v 1.35 2006/05/27 03:30:30 joris 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.36 2006/07/07 17:37:17 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 31,37 ****
  #include "log.h"
  
  extern char *__progname;
- 
  static int send_m = 1;
  
  /*
--- 31,36 ----
***************
*** 85,92 ****
  	/* The cvs program appends the command name to the program name */
  	if (level == LP_TRACE) {
  		strlcpy(prefix, " -> ", sizeof(prefix));
! 		if (cvs_cmdop == CVS_OP_SERVER)
  			prefix[0] = 'S';
  	} else if (cvs_command != NULL) {
  		if (level == LP_ABORT)
  			snprintf(prefix, sizeof(prefix), "%s [%s aborted]",
--- 84,93 ----
  	/* The cvs program appends the command name to the program name */
  	if (level == LP_TRACE) {
  		strlcpy(prefix, " -> ", sizeof(prefix));
! 		if (cvs_server_active)
  			prefix[0] = 'S';
+ 		else
+ 			prefix[0] = 'C';
  	} else if (cvs_command != NULL) {
  		if (level == LP_ABORT)
  			snprintf(prefix, sizeof(prefix), "%s [%s aborted]",
***************
*** 108,114 ****
  	else
  		out = stderr;
  
! 	if (cvs_cmdop == CVS_OP_SERVER) {
  		if (out == stdout)
  			putc('M', out);
  		else {
--- 109,115 ----
  	else
  		out = stderr;
  
! 	if (cvs_server_active) {
  		if (out == stdout)
  			putc('M', out);
  		else {
***************
*** 145,151 ****
  
  	va_start(vap, fmt);
  
! 	if (cvs_cmdop == CVS_OP_SERVER) {
  		ret = vasprintf(&nstr, fmt, vap);
  		if (ret == -1)
  			fatal("cvs_printf: %s", strerror(errno));
--- 146,152 ----
  
  	va_start(vap, fmt);
  
! 	if (cvs_server_active) {
  		ret = vasprintf(&nstr, fmt, vap);
  		if (ret == -1)
  			fatal("cvs_printf: %s", strerror(errno));