# 
# 
# patch "ChangeLog"
#  from [6813c4e2d977ecd0f30a3d8c88b4fcbffc7a0415]
#    to [d673b48951313217a73aa1fa4f9524fcebbc7a81]
# 
# patch "monotone.cc"
#  from [91e984161a12e1b357bb08a9d03ccb8cf963321c]
#    to [a38d1becb4854ff64d46f87c0c23d86cb8109d88]
# 
============================================================
--- ChangeLog	6813c4e2d977ecd0f30a3d8c88b4fcbffc7a0415
+++ ChangeLog	d673b48951313217a73aa1fa4f9524fcebbc7a81
@@ -1,3 +1,7 @@
+2006-05-19  Matthew Gregan  <address@hidden>
+
+	* monotone.cc (cpp_main): Smarter stripping of ".exe" extension.
+
 2006-05-18  Matthew Gregan  <address@hidden>
 
 	* testsuite.at, t_merge_lca.at: Rename to t_merge_7.at, tweak
============================================================
--- monotone.cc	91e984161a12e1b357bb08a9d03ccb8cf963321c
+++ monotone.cc	a38d1becb4854ff64d46f87c0c23d86cb8109d88
@@ -293,7 +293,8 @@
   // find base name of executable
 
   string prog_path = fs::path(uv.argv[0]).leaf();
-  prog_path = prog_path.substr(0, prog_path.find(".exe", 0));
+  if (prog_path.rfind(".exe") == prog_path.size() - 4)
+    prog_path = prog_path.substr(0, prog_path.size() - 4);
   utf8 prog_name(prog_path);
 
   // prepare for arg parsing