From e765b3c0adf2d1a6133b52ce7cb2e71a74811756 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 23 May 2008 16:38:51 +0000 Subject: * mount.cc (find_root_from_cygwin_dll): New function factored from from_fstab. Avoid use of tls since it isn't necessarily initialized when cygwin1.dll is dynamically loaded. (mount_info::create_root_entry): Ditto. (mount_info::init): Calculate cygwin root once. Use create_root_entry to record it. Pass fstab location to from_fstab. (mount_info::from_fstab): Move root calculation stuff elsewhere, as per above. * shared_info.h (mount_info::from_fstab_line): Make private. (mount_info::fstab): Ditto. Accommodate new arguments. --- winsup/cygwin/shared_info.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/shared_info.h') diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h index bd743d5df..197ef9529 100644 --- a/winsup/cygwin/shared_info.h +++ b/winsup/cygwin/shared_info.h @@ -75,9 +75,6 @@ class mount_info int add_item (const char *dev, const char *path, unsigned flags); int del_item (const char *path, unsigned flags); - bool from_fstab_line (char *line, bool user); - bool from_fstab (bool user); - unsigned set_flags_from_win32_path (const char *path); int conv_to_win32_path (const char *src_path, char *dst, device&, unsigned *flags = NULL); @@ -96,9 +93,12 @@ class mount_info PUNICODE_STRING cygd); private: - void sort (); void mount_slash (); + void mount_info::create_root_entry (const PWCHAR root); + + bool from_fstab_line (char *line, bool user); + bool from_fstab (bool user, WCHAR [], PWCHAR); int cygdrive_win32_path (const char *src, char *dst, int& unit); }; -- cgit v1.2.3