* cygpath.cc (do_pathconv): Fix erroneously printing native NT path

	prefix introduced by previous patch.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 42da428ae4460eb9f7d9b64c1c57f83adef2c8d3..95a0af791148eee6f27bc6844ea438cc3654ea8b 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 4dbdaeff07e2dc7f5d315e18be4b23775c2961ef..2ba727a9c3354321c547180e9e225d5d35ffd541 100644 (file)
--- 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)