From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Wed, 18 Jul 2007 19:59:41 +0000 (-0700)
Subject: Dump the device number of character/block devices.
X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=commitdiff_plain;h=f5207120aa57ca79d4983731e6c5bb3a74e7b5cf

Dump the device number of character/block devices.
---

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';