summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2005-06-02 20:16:48 +0000
committerjoris <joris@openbsd.org>2005-06-02 20:16:48 +0000
commit4ec26eccc5d44f862b91e17bed098e9e9614a8dc (patch)
tree3cfc7c801b572cc37559aa608c826a8486bbe1e8
parentbe gone unused init handler. (diff)
downloadwireguard-openbsd-4ec26eccc5d44f862b91e17bed098e9e9614a8dc.tar.xz
wireguard-openbsd-4ec26eccc5d44f862b91e17bed098e9e9614a8dc.zip
make cvs_printf() a bit smarter, so it can be called without having
to worry about the 'M' in server mode. OK jfb@
-rw-r--r--usr.bin/cvs/log.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c
index 82e01b2a84c..c78eb32926e 100644
--- a/usr.bin/cvs/log.c
+++ b/usr.bin/cvs/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.17 2005/06/02 16:05:38 xsa Exp $ */
+/* $OpenBSD: log.c,v 1.18 2005/06/02 20:16:48 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -299,6 +299,7 @@ cvs_printf(const char *fmt, ...)
int ret;
char *nstr, *dp, *sp;
va_list vap;
+ static int send_m = 1;
va_start(vap, fmt);
@@ -311,8 +312,12 @@ cvs_printf(const char *fmt, ...)
for (sp = dp; *sp != '\0'; sp++)
;
- putc('M', stdout);
- putc(' ', stdout);
+ if (send_m) {
+ send_m = 0;
+ putc('M', stdout);
+ putc(' ', stdout);
+ }
+
fwrite(dp, sizeof(char), (size_t)(sp - dp),
stdout);
@@ -320,6 +325,7 @@ cvs_printf(const char *fmt, ...)
break;
putc('\n', stdout);
+ send_m = 1;
dp = sp + 1;
}
free(nstr);