From 8c3b9aaaab11be9d0fe24a72ebb16e171ca22125 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 1 Nov 2018 21:46:50 -0400 Subject: Print device major/minor numbers for -ls --- stat.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'stat.c') diff --git a/stat.c b/stat.c index 2e046d6..b8f1704 100644 --- a/stat.c +++ b/stat.c @@ -32,7 +32,6 @@ #if HAVE_STATX || defined(__NR_statx) # define HAVE_BFS_STATX true -# include #endif #if __APPLE__ @@ -82,6 +81,9 @@ static void bfs_stat_convert(const struct stat *statbuf, struct bfs_stat *buf) { buf->blocks = statbuf->st_blocks; buf->mask |= BFS_STAT_BLOCKS; + buf->rdev = statbuf->st_rdev; + buf->mask |= BFS_STAT_RDEV; + buf->atime = statbuf->st_atim; buf->mask |= BFS_STAT_ATIME; @@ -154,7 +156,7 @@ static int bfs_statx_impl(int at_fd, const char *at_path, int at_flags, enum bfs buf->mask = 0; - buf->dev = makedev(xbuf.stx_dev_major, xbuf.stx_dev_minor); + buf->dev = bfs_makedev(xbuf.stx_dev_major, xbuf.stx_dev_minor); buf->mask |= BFS_STAT_DEV; if (xbuf.stx_mask & STATX_INO) { @@ -195,6 +197,9 @@ static int bfs_statx_impl(int at_fd, const char *at_path, int at_flags, enum bfs buf->mask |= BFS_STAT_BLOCKS; } + buf->rdev = bfs_makedev(xbuf.stx_rdev_major, xbuf.stx_rdev_minor); + buf->mask |= BFS_STAT_RDEV; + if (xbuf.stx_mask & STATX_ATIME) { buf->atime.tv_sec = xbuf.stx_atime.tv_sec; buf->atime.tv_nsec = xbuf.stx_atime.tv_nsec; -- cgit v1.2.3