===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/log.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/cvs/log.c	2007/09/07 23:59:01	1.41
--- src/usr.bin/cvs/log.c	2008/01/10 10:05:40	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: log.c,v 1.41 2007/09/07 23:59:01 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.42 2008/01/10 10:05:40 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 61,67 ****
  {
  	int ecp;
  	FILE *out;
- 	struct cvs_cmd *cmdp;
  
  	if (cvs_trace != 1 && level == LP_TRACE)
  		return;
--- 61,66 ----
***************
*** 96,114 ****
  		(void)fputs("-> ", out);
  	} else if (level != LP_RCS) {
  		(void)fputs(__progname, out);
! 		if (cvs_command != NULL) {
! 			/*
! 			 * always use the command name in error messages,
! 			 * not aliases
! 			 */
! 			cmdp = cvs_findcmd(cvs_command);
! 			putc(' ', out);
! 			if (level == LP_ABORT)
! 				(void)fprintf(out,
! 				    "[%s aborted]", cmdp->cmd_name);
! 			else
! 				(void)fputs(cmdp->cmd_name, out);
! 		}
  		(void)fputs(": ", out);
  	}
  
--- 95,106 ----
  		(void)fputs("-> ", out);
  	} else if (level != LP_RCS) {
  		(void)fputs(__progname, out);
! 		putc(' ', out);
! 		if (level == LP_ABORT)
! 			(void)fprintf(out,
! 			    "[%s aborted]", cmdp->cmd_name);
! 		else
! 			(void)fputs(cmdp->cmd_name, out);
  		(void)fputs(": ", out);
  	}