From 98fc1a6dfe82f5c0cf03a99ee1991630b0f2479c Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 24 Sep 2004 19:41:19 +0000 Subject: [PATCH] Sergey Ivanov * path.cc (mount_info::read_cygdrive_info_from_registry): Default /cygdrive to binary mode. --- winsup/cygwin/ChangeLog | 8 +++++++- winsup/cygwin/path.cc | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 84cc74923..5231de031 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,8 +1,14 @@ +2004-09-24 Christopher Faylor + Sergey Ivanov + + * path.cc (mount_info::read_cygdrive_info_from_registry): Default + /cygdrive to binary mode. + 2004-09-22 Pierre Humblet * path.cc (normalize_win32_path): Only look for : in second position. Avoid infinite loop with names starting in double dots. - (mount_info::conv_to_win32_path): Do not worry about a trailing dot. + (mount_info::conv_to_win32_path): Do not worry about a trailing dot. (hash_path_name): Ditto. 2004-09-20 Christopher Faylor diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 4b922d7e2..94619366e 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1937,7 +1937,7 @@ mount_info::read_cygdrive_info_from_registry () if (r2.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, cygdrive, sizeof (cygdrive), "")) strcpy (cygdrive, CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX); - cygdrive_flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE); + cygdrive_flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); slashify (cygdrive, cygdrive, 1); cygdrive_len = strlen (cygdrive); } @@ -1945,7 +1945,7 @@ mount_info::read_cygdrive_info_from_registry () { /* Fetch user cygdrive_flags from registry; returns MOUNT_CYGDRIVE on error. */ - cygdrive_flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE); + cygdrive_flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); slashify (cygdrive, cygdrive, 1); cygdrive_len = strlen (cygdrive); } @@ -2052,7 +2052,7 @@ mount_info::get_cygdrive_info (char *user, char *system, char* user_flags, /* Get the user flags, if appropriate */ if (res == ERROR_SUCCESS) { - int flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE); + int flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); strcpy (user_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode"); } @@ -2066,7 +2066,7 @@ mount_info::get_cygdrive_info (char *user, char *system, char* user_flags, /* Get the system flags, if appropriate */ if (res2 == ERROR_SUCCESS) { - int flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE); + int flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); strcpy (system_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode"); } -- 2.43.5