diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-02-22 17:40:46 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-02-22 17:40:46 +0000 |
| commit | 80206d7f71225766539e72bb31256bbc5618bd65 (patch) | |
| tree | ddc3004a619ce273a05f39f33f374b98e794590d | |
| parent | f2ecf0ee5baad69485597fda7dc8d57d479a7204 (diff) | |
| download | cygnal-80206d7f71225766539e72bb31256bbc5618bd65.tar.gz cygnal-80206d7f71225766539e72bb31256bbc5618bd65.tar.bz2 cygnal-80206d7f71225766539e72bb31256bbc5618bd65.zip | |
* cygpath.cc (do_pathconv): Fix erroneously printing native NT path
prefix introduced by previous patch.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/cygpath.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 42da428ae..95a0af791 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,10 @@ 2010-02-22 Corinna Vinschen <corinna@vinschen.de> + * cygpath.cc (do_pathconv): Fix erroneously printing native NT path + prefix introduced by previous patch. + +2010-02-22 Corinna Vinschen <corinna@vinschen.de> + * locale.cc (lc_time_names): Add "date_fmt" entry. 2010-02-19 Christopher Faylor <me+cygwin@cgf.cx> diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc index 4dbdaeff0..2ba727a9c 100644 --- a/winsup/utils/cygpath.cc +++ b/winsup/utils/cygpath.cc @@ -687,6 +687,7 @@ do_pathconv (char *filename) wchar_t *buf2 = NULL; DWORD len; ssize_t err; + bool print_tmp = false; cygwin_conv_path_t conv_func = (unix_flag ? CCP_WIN_A_TO_POSIX : (path_flag ? CCP_POSIX_TO_WIN_A @@ -783,6 +784,7 @@ do_pathconv (char *filename) tmp += len; if (len == 6) *tmp = '\\'; + print_tmp = true; } } if (mixed_flag) @@ -790,7 +792,7 @@ do_pathconv (char *filename) } } - puts (buf); + puts (print_tmp ? tmp : buf); if (buf2) free (buf2); if (buf) |