[src/trunk]: src/usr.sbin/mtree PR/41061: Steven Drake: mtree -d complains ab...

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

details:   https://anonhg.NetBSD.org/src/rev/64764dda6f2f
branches:  trunk
changeset: 778421:64764dda6f2f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 25 16:07:04 2012 +0000

description:
PR/41061: Steven Drake: mtree -d complains about extra symlinks

diffstat:

 usr.sbin/mtree/verify.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9b97db548d3b -r 64764dda6f2f usr.sbin/mtree/verify.c
--- a/usr.sbin/mtree/verify.c   Sun Mar 25 15:40:32 2012 +0000
+++ b/usr.sbin/mtree/verify.c   Sun Mar 25 16:07:04 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: verify.c,v 1.39 2006/10/07 15:35:51 elad Exp $ */
+/*     $NetBSD: verify.c,v 1.40 2012/03/25 16:07:04 christos Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)verify.c   8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: verify.c,v 1.39 2006/10/07 15:35:51 elad Exp $");
+__RCSID("$NetBSD: verify.c,v 1.40 2012/03/25 16:07:04 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -141,7 +141,7 @@
                if (ep)
                        continue;
  extra:
-               if (!eflag) {
+               if (!eflag && !(dflag && p->fts_info == FTS_SL)) {
                        printf("extra: %s", RP(p));
                        if (rflag) {
                                if ((S_ISDIR(p->fts_statp->st_mode)