[src/netbsd-1-6]: src/bin/pax Pullup rev 1.12-1.16 (requested by rafal in tic...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd8083d36f9b
branches:  netbsd-1-6
changeset: 531284:fd8083d36f9b
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 07 06:59:04 2004 +0000

description:
Pullup rev 1.12-1.16 (requested by rafal in ticket #1021)

Pullup pax to current version on trunk. Includes many fixes.

diffstat:

 bin/pax/tty_subs.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r b16298c4b2ba -r fd8083d36f9b bin/pax/tty_subs.c
--- a/bin/pax/tty_subs.c        Wed Apr 07 06:59:01 2004 +0000
+++ b/bin/pax/tty_subs.c        Wed Apr 07 06:59:04 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty_subs.c,v 1.11 2002/01/31 19:27:54 tv Exp $ */
+/*     $NetBSD: tty_subs.c,v 1.11.2.1 2004/04/07 06:59:04 jmc Exp $    */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -37,12 +33,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(lint)
+#if !defined(lint)
 #if 0
 static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: tty_subs.c,v 1.11 2002/01/31 19:27:54 tv Exp $");
+__RCSID("$NetBSD: tty_subs.c,v 1.11.2.1 2004/04/07 06:59:04 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -184,7 +184,7 @@
         * line by itself
         */
        if (vflag && vfpart) {
-               (void)fputc('\n', stderr);
+               (void)fputc('\n', stdout);
                vfpart = 0;
        }
        (void)fprintf(stderr, "%s: ", argv0);
@@ -195,6 +195,6 @@
         * format and print the errno
         */
        if (errnum > 0)
-               (void)fprintf(stderr, " <%s>", strerror(errnum));
+               (void)fprintf(stderr, " (%s)", strerror(errnum));
        (void)fputc('\n', stderr);
 }