From owner-svn-src-projects@FreeBSD.ORG Fri Sep 21 19:22:44 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BDCB106564A; Fri, 21 Sep 2012 19:22:44 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EBA068FC08; Fri, 21 Sep 2012 19:22:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8LJMhVu091094; Fri, 21 Sep 2012 19:22:43 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8LJMhvU091092; Fri, 21 Sep 2012 19:22:43 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201209211922.q8LJMhvU091092@svn.freebsd.org> From: Brooks Davis Date: Fri, 21 Sep 2012 19:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240785 - projects/mtree/contrib/mtree X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 19:22:44 -0000 Author: brooks Date: Fri Sep 21 19:22:43 2012 New Revision: 240785 URL: http://svn.freebsd.org/changeset/base/240785 Log: Allow uid and uname or gid and gname to both be printed while preserving the behavior of falling back to [ug]id when the name is not resolvable. Modified: projects/mtree/contrib/mtree/create.c Modified: projects/mtree/contrib/mtree/create.c ============================================================================== --- projects/mtree/contrib/mtree/create.c Fri Sep 21 19:18:39 2012 (r240784) +++ projects/mtree/contrib/mtree/create.c Fri Sep 21 19:22:43 2012 (r240785) @@ -187,14 +187,14 @@ statf(int indent, FTSENT *p) if (keys & F_UNAME && (name = user_from_uid(p->fts_statp->st_uid, 1)) != NULL) output(indent, &offset, "uname=%s", name); - else /* if (keys & F_UID) */ + if (keys & F_UID || (keys & F_UNAME && name == NULL)) output(indent, &offset, "uid=%u", p->fts_statp->st_uid); } if (keys & (F_GID | F_GNAME) && p->fts_statp->st_gid != gid) { if (keys & F_GNAME && (name = group_from_gid(p->fts_statp->st_gid, 1)) != NULL) output(indent, &offset, "gname=%s", name); - else /* if (keys & F_GID) */ + if (keys & F_GID || (keys & F_GNAME && name == NULL)) output(indent, &offset, "gid=%u", p->fts_statp->st_gid); } if (keys & F_MODE && (p->fts_statp->st_mode & MBITS) != mode) @@ -385,14 +385,14 @@ statd(FTS *t, FTSENT *parent, uid_t *pui if (keys & F_UNAME && (name = user_from_uid(saveuid, 1)) != NULL) printf(" uname=%s", name); - else /* if (keys & F_UID) */ + if (keys & F_UID || (keys & F_UNAME && name == NULL)) printf(" uid=%lu", (u_long)saveuid); } if (keys & (F_GID | F_GNAME)) { if (keys & F_GNAME && (name = group_from_gid(savegid, 1)) != NULL) printf(" gname=%s", name); - else /* if (keys & F_UID) */ + if (keys & F_GID || (keys & F_GNAME && name == NULL)) printf(" gid=%lu", (u_long)savegid); } if (keys & F_MODE)