From e8f867e03e1052e3adedd671827c04abc11373cc Mon Sep 17 00:00:00 2001 From: Xavier Santolaria Date: Wed, 8 Mar 2006 08:44:30 +0000 Subject: respect -q; pointed out by Ray Lai. --- usr.bin/rcs/rcsmerge.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index 6b6524ed053..004a37e6848 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.17 2006/03/07 01:40:52 joris Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.18 2006/03/08 08:44:29 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria * All rights reserved. @@ -112,7 +112,8 @@ rcsmerge_main(int argc, char **argv) if ((file = rcs_open(fpath, RCS_READ)) == NULL) continue; - printf("RCS file: %s\n", fpath); + if (verbose == 1) + fprintf(stderr, "RCS file: %s\n", fpath); if (rev2 == RCS_HEAD_REV) frev = file->rf_head; @@ -127,8 +128,10 @@ rcsmerge_main(int argc, char **argv) rcsnum_tostr(baserev, r1, sizeof(r1)); rcsnum_tostr(frev, r2, sizeof(r2)); - printf("Merging differences between %s and %s into %s%s\n", - r1, r2, argv[i], (pipeout == 1) ? "; result to stdout":""); + if (verbose == 1) + fprintf(stderr, "Merging differences between %s and " + "%s into %s%s\n", r1, r2, argv[i], + (pipeout == 1) ? "; result to stdout":""); if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) { cvs_log(LP_ERR, "failed to merge"); -- cgit v1.2.3