svn commit: r314129 - stable/11/bin/ls
Konstantin Belousov
kib at FreeBSD.org
Thu Feb 23 07:42:50 UTC 2017
Author: kib
Date: Thu Feb 23 07:42:49 2017
New Revision: 314129
URL: https://svnweb.freebsd.org/changeset/base/314129
Log:
MFC r313798:
Use uintmax_t to print st_nlink.
Modified:
stable/11/bin/ls/print.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/bin/ls/print.c
==============================================================================
--- stable/11/bin/ls/print.c Thu Feb 23 07:39:01 2017 (r314128)
+++ stable/11/bin/ls/print.c Thu Feb 23 07:42:49 2017 (r314129)
@@ -259,12 +259,12 @@ printlong(const DISPLAY *dp)
np = p->fts_pointer;
xo_attr("value", "%03o", (int) sp->st_mode & ALLPERMS);
if (f_numericonly) {
- xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {td:user/%-*s}{e:user/%ju} {td:group/%-*s}{e:group/%ju} ",
- buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
+ xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*ju} {td:user/%-*s}{e:user/%ju} {td:group/%-*s}{e:group/%ju} ",
+ buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, (uintmax_t)sp->st_nlink,
dp->s_user, np->user, (uintmax_t)sp->st_uid, dp->s_group, np->group, (uintmax_t)sp->st_gid);
} else {
- xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*u} {t:user/%-*s} {t:group/%-*s} ",
- buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, sp->st_nlink,
+ xo_emit("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*ju} {t:user/%-*s} {t:group/%-*s} ",
+ buf, (int) sp->st_mode & ALLPERMS, dp->s_nlink, (uintmax_t)sp->st_nlink,
dp->s_user, np->user, dp->s_group, np->group);
}
if (S_ISBLK(sp->st_mode))
More information about the svn-src-all
mailing list