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

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

details:   https://anonhg.NetBSD.org/src/rev/5b464b857c5f
branches:  netbsd-1-6
changeset: 531277:5b464b857c5f
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 07 06:58:37 2004 +0000

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

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

diffstat:

 bin/pax/sel_subs.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r ddfa1a71d1d9 -r 5b464b857c5f bin/pax/sel_subs.c
--- a/bin/pax/sel_subs.c        Wed Apr 07 06:58:32 2004 +0000
+++ b/bin/pax/sel_subs.c        Wed Apr 07 06:58:37 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sel_subs.c,v 1.15 2002/01/31 19:27:54 tv Exp $ */
+/*     $NetBSD: sel_subs.c,v 1.15.2.1 2004/04/07 06:58:37 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[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: sel_subs.c,v 1.15 2002/01/31 19:27:54 tv Exp $");
+__RCSID("$NetBSD: sel_subs.c,v 1.15.2.1 2004/04/07 06:58:37 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -384,7 +384,7 @@
        }
 
        /*
-        * by default we only will check file mtime, but usee can specify
+        * by default we only will check file mtime, but user can specify
         * mtime, ctime (inode change time) or both.
         */
        if ((flgpt == NULL) || (*flgpt == '\0'))