From 54b15f3fd651ffb09260cee598f458c1fb29ce60 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 24 Dec 2016 16:13:42 +0100 Subject: extfs: Add label retrieval --- src/extsh.cpp | 8 ++++++-- src/fs/extfs.cpp | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/extsh.cpp b/src/extsh.cpp index 87df7d3..07a7d47 100644 --- a/src/extsh.cpp +++ b/src/extsh.cpp @@ -10,10 +10,14 @@ int main(int argc, char const * argv[]) if(disk.open()) { - std::clog << "[EXT2] Successfully opened ext*fs at: '" << path << "'\n"; + std::clog << "[EXTSH] Successfully opened ext*fs at: '" << path << "'\n"; + if(disk.has_label()) + { + std::clog << "[EXTSH] The filesystem is labeled '" << disk.label() << "'\n"; + } } else { - std::clog << "[EXT2] Failed to open ext*fs at: '" << path << "'\n"; + std::clog << "[EXTSH] Failed to open ext*fs at: '" << path << "'\n"; } } diff --git a/src/fs/extfs.cpp b/src/fs/extfs.cpp index 55cffd8..671124d 100644 --- a/src/fs/extfs.cpp +++ b/src/fs/extfs.cpp @@ -32,4 +32,14 @@ namespace fs return m_stream && m_primarySuperblock.magic_number == kExtfsMagic; } + std::string extfs::label() const + { + return std::string{m_primarySuperblock.label.cbegin(), m_primarySuperblock.label.cend()}; + } + + bool extfs::has_label() const + { + return m_primarySuperblock.label[0]; + } + } -- cgit v1.2.3