From be070362912fcef179ede483d00ecbfa3a361276 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 21 Mar 2009 21:09:29 +0000 Subject: [PATCH] A non-empty volume name looks much better in Tracker. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29635 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../file_systems/userlandfs/server/fuse/FUSEVolume.cpp | 6 +++++- .../kernel/file_systems/userlandfs/server/fuse/FUSEVolume.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp index 5cad5f1168..f5a1c5f501 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp @@ -299,6 +299,9 @@ printf("FUSEVolume::Mount()\n"); fNodes.Insert(node); fEntries.Insert(entry); + // init the volume name + snprintf(fName, sizeof(fName), "%s Volume", _FileSystem()->GetName()); + // publish the root node error = UserlandFS::KernelEmu::publish_vnode(fID, node->id, node, node->type, 0, _FileSystem()->GetNodeCapabilities()); @@ -349,7 +352,8 @@ FUSEVolume::ReadFSInfo(fs_info* info) info->free_blocks = st.f_bfree; info->total_nodes = st.f_files; info->free_nodes = 100; // st.f_favail is ignored by statfs() - info->volume_name[0] = '\0'; // no way to get the name (if any) + strlcpy(info->volume_name, fName, sizeof(info->volume_name)); + // no way to get the real name (if any) return B_OK; } diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.h b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.h index 63f52ff09d..945f22effc 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.h @@ -158,6 +158,7 @@ private: ino_t fNextNodeID; bool fUseNodeIDs; // TODO: Actually read the // option! + char fName[B_OS_NAME_LENGTH]; }; } // namespace UserlandFS