diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-10-31 13:23:33 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-10-31 13:23:33 +0000 |
| commit | 15346b69501aff03969f596430b1dc35d22b2006 (patch) | |
| tree | d2313df16bdff8875360e3c6eed790259a7fe830 /winsup/cygwin/path.cc | |
| parent | 3ce8215a01ddcc6229c2e808a488a315711b98a6 (diff) | |
| download | cygnal-15346b69501aff03969f596430b1dc35d22b2006.tar.gz cygnal-15346b69501aff03969f596430b1dc35d22b2006.tar.bz2 cygnal-15346b69501aff03969f596430b1dc35d22b2006.zip | |
* external.cc (get_cygdrive_info): Make inline.
(get_cygdrive_prefixes): Remove.
(cygwin_internal): Call get_cygdrive_info with NULL flag parameters
instead of get_cygdrive_prefixes.
* path.cc (mount_info::get_cygdrive_info): Allow NULL flag parameters.
Diffstat (limited to 'winsup/cygwin/path.cc')
| -rw-r--r-- | winsup/cygwin/path.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 6720f1d6b..a10a29339 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -2379,7 +2379,7 @@ mount_info::get_cygdrive_info (char *user, char *system, char* user_flags, int res = r.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, user, CYG_MAX_PATH, ""); /* Get the user flags, if appropriate */ - if (res == ERROR_SUCCESS) + if (user_flags && res == ERROR_SUCCESS) { int flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); strcpy (user_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode"); @@ -2390,7 +2390,7 @@ mount_info::get_cygdrive_info (char *user, char *system, char* user_flags, int res2 = r2.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, system, CYG_MAX_PATH, ""); /* Get the system flags, if appropriate */ - if (res2 == ERROR_SUCCESS) + if (system_flags && res2 == ERROR_SUCCESS) { int flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE | MOUNT_BINARY); strcpy (system_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode"); |