===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/log.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/usr.bin/cvs/log.c	2005/08/05 16:21:41	1.25
+++ src/usr.bin/cvs/log.c	2005/09/19 15:45:16	1.26
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.25 2005/08/05 16:21:41 xsa Exp $	*/
+/*	$OpenBSD: log.c,v 1.26 2005/09/19 15:45:16 niallo Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -65,7 +65,9 @@
 	LOG_DEBUG,
 };
 
+#if !defined(RCSPROG)
 static int send_m = 1;
+#endif
 static u_int cvs_log_dest = LD_STD;
 static u_int cvs_log_flags = 0;
 
@@ -205,7 +207,9 @@
 	int ecp;
 	char prefix[64], buf[1024], ebuf[255];
 	FILE *out;
+#if !defined(RCSPROG)
 	struct cvs_cmd *cmdp;
+#endif
 
 	if (level > LP_MAX)
 		return (-1);
@@ -220,6 +224,7 @@
 		ecp = 0;
 
 	/* always use the command name in error messages, not aliases */
+#if !defined(RCSPROG)
 	cmdp = cvs_findcmd(cvs_command);
 
 	/* The cvs program appends the command name to the program name */
@@ -235,6 +240,7 @@
 			snprintf(prefix, sizeof(prefix), "%s %s", __progname,
 			    cmdp->cmd_name);
 	} else /* just use the standard strlcpy */
+#endif
 		strlcpy(prefix, __progname, sizeof(prefix));
 
 	if ((cvs_log_flags & LF_PID) && (level != LP_TRACE)) {
@@ -254,6 +260,7 @@
 		else
 			out = stderr;
 
+#if !defined(RCSPROG)
 		if (cvs_cmdop == CVS_OP_SERVER) {
 			if (out == stdout)
 				putc('M', out);
@@ -263,6 +270,7 @@
 			}
 			putc(' ', out);
 		}
+#endif
 
 		fputs(prefix, out);
 		if (level != LP_TRACE)
@@ -292,11 +300,14 @@
 cvs_printf(const char *fmt, ...)
 {
 	int ret;
+#if !defined(RCSPROG)
 	char *nstr, *dp, *sp;
+#endif
 	va_list vap;
 
 	va_start(vap, fmt);
 
+#if !defined(RCSPROG)
 	if (cvs_cmdop == CVS_OP_SERVER) {
 		ret = vasprintf(&nstr, fmt, vap);
 		if (ret != -1) {
@@ -325,6 +336,7 @@
 			free(nstr);
 		}
 	} else
+#endif
 		ret = vprintf(fmt, vap);
 
 	va_end(vap);
@@ -333,14 +345,18 @@
 void
 cvs_putchar(int c)
 {
+#if !defined(RCSPROG)
 	if (cvs_cmdop == CVS_OP_SERVER && send_m) {
 		send_m = 0;
 		putc('M', stdout);
 		putc(' ', stdout);
 	}
+#endif
 
 	putc(c, stdout);
 
+#if !defined(RCSPROG)
 	if (cvs_cmdop == CVS_OP_SERVER && c == '\n')
 		send_m = 1;
+#endif
 }