From f5207120aa57ca79d4983731e6c5bb3a74e7b5cf Mon Sep 17 00:00:00 2001 From: Michael Vrable Date: Wed, 18 Jul 2007 12:59:41 -0700 Subject: [PATCH] Dump the device number of character/block devices. --- scandir.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scandir.cc b/scandir.cc index 5d7c9c5..89bdaab 100644 --- a/scandir.cc +++ b/scandir.cc @@ -348,11 +348,10 @@ void scanfile(const string& path, bool include) case S_IFSOCK: inode_type = 's'; break; - case S_IFCHR: - inode_type = 'c'; - break; case S_IFBLK: - inode_type = 'b'; + case S_IFCHR: + inode_type = ((stat_buf.st_mode & S_IFMT) == S_IFBLK) ? 'b' : 'c'; + file_info["device"] = encode_int(stat_buf.st_rdev); break; case S_IFLNK: inode_type = 'l'; -- 2.20.1