diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-08 08:44:30 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-08 08:44:30 +0000 |
| commit | e8f867e03e1052e3adedd671827c04abc11373cc (patch) | |
| tree | dfbdbf3f1a24bf5ccf99b3f7748819ab08b30e17 | |
| parent | 44577aef66445f110ccc679a98460583473df089 (diff) | |
respect -q; pointed out by Ray Lai.
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 11 |
1 files 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 <xsa@openbsd.org> * 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"); |