diff options
| author | Jose Luis Duran <jlduran@FreeBSD.org> | 2026-01-11 16:42:18 +0000 |
|---|---|---|
| committer | Jose Luis Duran <jlduran@FreeBSD.org> | 2026-01-18 03:56:23 +0000 |
| commit | e2e7269461e94c56792801a6447ddee18baab52f (patch) | |
| tree | 2d4c5f9fe4181f520d2147cb733d5c8bc9a9bc22 /contrib/mtree/create.c | |
| parent | 2184a2d18a1b08796b3a5fba987d753395b2f8d8 (diff) | |
Import latest mtree from NetBSDstable/15
Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'
This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all". This was clarified in the man page.
Reported by: glebius
PR: 219467
MFC after: 1 week
(cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0)
Diffstat (limited to 'contrib/mtree/create.c')
| -rw-r--r-- | contrib/mtree/create.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c index 191d69c6a537..68abbfa0258b 100644 --- a/contrib/mtree/create.c +++ b/contrib/mtree/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $ */ +/* $NetBSD: create.c,v 1.81 2026/01/10 14:53:39 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.81 2026/01/10 14:53:39 christos Exp $"); #endif #endif /* not lint */ @@ -236,8 +236,7 @@ statf(FILE *fp, int indent, FTSENT *p) offset += fprintf(fp, "%*s", (INDENTNAMELEN + indent) - offset, ""); - if (keys & F_TYPE && - !S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) + if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { |