diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-17 19:37:41 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-17 19:37:41 +0000 |
| commit | 12be27a6bfe8e288d68009b7d31dcd947e60c007 (patch) | |
| tree | 6aad0cc7dc571b0fadab006484a639644a8d5fac | |
| parent | 5eb58755945b6184808b43291263f183fc261a28 (diff) | |
fix printf's
| -rw-r--r-- | usr.bin/rcs/ci.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/co.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 2f54b5f0f42..d35fe2a77a2 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.173 2006/05/11 08:24:24 xsa Exp $ */ +/* $OpenBSD: ci.c,v 1.174 2006/05/17 19:37:40 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -412,8 +412,8 @@ checkin_getlogmsg(RCSNUM *rev, RCSNUM *rev2, int flags) rcsnum_free(tmprev); if (!(flags & QUIET)) - printf("new revision: %s; previous revision: %s\n", nrev, - prev); + (void)fprintf(stderr, "new revision: %s; " + "previous revision: %s\n", nrev, prev); rcs_msg = rcs_prompt(prompt); diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 3d6b04fad72..4202937c27f 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.90 2006/05/11 09:43:19 xsa Exp $ */ +/* $OpenBSD: co.c,v 1.91 2006/05/17 19:37:40 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -347,7 +347,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, if (!(flags & QUIET) && !(flags & NEWFILE) && !(flags & CO_REVERT) && file->rf_ndelta != 0) - printf("revision %s", buf); + (void)fprintf(stderr, "revision %s", buf); if (file->rf_ndelta != 0) { if ((bp = rcs_getrev(file, rev)) == NULL) { @@ -393,7 +393,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, if (file->rf_ndelta != 0) { if (!(flags & QUIET) && !(flags & NEWFILE) && !(flags & CO_REVERT)) - printf(" (locked)"); + (void)fprintf(stderr, " (locked)"); } } else if (flags & CO_UNLOCK) { if (file->rf_ndelta != 0) { @@ -412,13 +412,13 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, if (file->rf_ndelta != 0) { if (!(flags & QUIET) && !(flags & NEWFILE) && !(flags & CO_REVERT)) - printf(" (unlocked)"); + (void)fprintf(stderr, " (unlocked)"); } } if (file->rf_ndelta == 0 && !(flags & QUIET) && ((flags & CO_LOCK) || (flags & CO_UNLOCK))) { - (void)fprintf(stderr, "no revisions, so nothing can be %s", + (void)fprintf(stderr, "no revisions, so nothing can be %s\n", (flags & CO_LOCK) ? "locked" : "unlocked"); } else if (file->rf_ndelta != 0) { /* XXX - Not a good way to detect if a newline is needed. */ @@ -449,11 +449,11 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, * revision, and prompt if there are differences. */ if (st.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) - printf("writable "); - printf("%s exists%s; ", dst, + (void)fprintf(stderr, "writable "); + (void)fprintf(stderr, "%s exists%s; ", dst, (getuid() == st.st_uid) ? "" : ", and you do not own it"); - printf("remove it? [ny](n): "); + (void)fprintf(stderr, "remove it? [ny](n): "); /* default is n */ if (rcs_yesno() == -1) { if (!(flags & QUIET) && isatty(STDIN_FILENO)) |