# 
# 
# patch "ChangeLog"
#  from [09bd036bc56356dfb47d906f8d3ee09ea3aa49d3]
#    to [a118a3656e997997f341b0d394957b8733b845e0]
# 
# patch "win32/fs.cc"
#  from [d4bbd27d041e4767ef6b1d3e341c5ee65ce1f44f]
#    to [89abf9434fa2593686f9b4ea42d9bbfe649fa592]
# 
============================================================
--- ChangeLog	09bd036bc56356dfb47d906f8d3ee09ea3aa49d3
+++ ChangeLog	a118a3656e997997f341b0d394957b8733b845e0
@@ -1,3 +1,8 @@
+2006-05-01  Matthew Gregan  <address@hidden>
+
+	* win32/fs.cc (get_current_working_dir): Strip trailing backslash
+	from path, if present.  Fixes bug #16442.
+
 2006-05-01  Timothy Brownawell  <address@hidden>
 
 	* automate.cc: "automate common_ancestors" was committed accidentally.
============================================================
--- win32/fs.cc	d4bbd27d041e4767ef6b1d3e341c5ee65ce1f44f
+++ win32/fs.cc	89abf9434fa2593686f9b4ea42d9bbfe649fa592
@@ -23,7 +23,10 @@
   char buffer[4096];
   E(getcwd(buffer, 4096),
     F("cannot get working directory: %s") % strerror(errno));
-  return std::string(buffer);
+  std::string str(buffer);
+  if (str[str.size() - 1] == '\\')
+    str = str.substr(0, str.size() - 1);
+  return str;
 }
 
 void