From ecef4a24f29755ec7c98f55067a41643362e9a89 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 25 Feb 2016 16:02:37 +0100 Subject: fix %x with -U --- lr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lr.c') diff --git a/lr.c b/lr.c index 0ce5963..707000e 100644 --- a/lr.c +++ b/lr.c @@ -1550,6 +1550,13 @@ callback(const char *fpath, const struct stat *sb, int depth, int entries, off_t if (expr && !eval(expr, fi)) return 0; + if (need_xattr) { + strncpy(fi->xattr, xattr_string(fi->fpath), sizeof fi->xattr); + if (strlen(fi->xattr) > maxxattr) + maxxattr = strlen(fi->xattr); + } else + memset(fi->xattr, 0, sizeof fi->xattr); + if (Uflag) print(&fi, postorder, depth); else @@ -1583,12 +1590,6 @@ callback(const char *fpath, const struct stat *sb, int depth, int entries, off_t groupname(fi->sb.st_gid); if (need_fstype) fstype(fi->sb.st_dev); - if (need_xattr) { - strncpy(fi->xattr, xattr_string(fi->fpath), sizeof fi->xattr); - if (strlen(fi->xattr) > maxxattr) - maxxattr = strlen(fi->xattr); - } else - memset(fi->xattr, 0, sizeof fi->xattr); return 0; } -- cgit 1.4.1