From a6131454a5de1af75b06d5dc473ffe4af850b46e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 23 Jul 2009 11:46:06 +0000 Subject: * mount.h (fs_info::fsn): New member. (fs_info::clear): Clear fsn. (fs_info::fsname): New read accessor for fsn. * mount.cc (fs_info::update): Fill in fsn member with lowercased filesystem name if filesystem is not well-known. Fall back to "unknown" if filesystem name is missing. (fillout_mntent): Print filesystem name retrieved in fs_info::update rather than static string "unknown". --- winsup/cygwin/mount.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/mount.h') diff --git a/winsup/cygwin/mount.h b/winsup/cygwin/mount.h index c169ca33b..8876bbe13 100644 --- a/winsup/cygwin/mount.h +++ b/winsup/cygwin/mount.h @@ -43,10 +43,16 @@ class fs_info }; } status; ULONG sernum; + char fsn[80]; unsigned long got_fs () { return status.fs_flags; } public: - void clear () { memset (&status, 0 , sizeof status); sernum = 0UL; } + void clear () + { + memset (&status, 0 , sizeof status); + sernum = 0UL; + fsn[0] = '\0'; + } fs_info () { clear (); } IMPLEMENT_STATUS_FLAG (ULONG, flags) @@ -71,6 +77,7 @@ class fs_info int has_buggy_open () const {return is_sunwnfs ();} int has_buggy_fileid_dirinfo () const {return is_unixfs ();} + const char *fsname () const { return fsn[0] ? fsn : "unknown"; } bool update (PUNICODE_STRING, HANDLE) __attribute__ ((regparm (3))); }; -- cgit v1.2.3