Index: Modules/getpath.c
===================================================================
--- Modules/getpath.c	(revision 66332)
+++ Modules/getpath.c	(working copy)
@@ -183,13 +183,19 @@
 	errno = EINVAL;
 	return -1;
     }
+#ifdef HAVE_BROKEN_MBSTOWCS
+    cbuf[res] = '\0';
+#endif
     r1 = mbstowcs(buf, cbuf, bufsiz);
     if (r1 == -1) {
 	errno = EINVAL;
 	return -1;
     }
+#ifdef HAVE_BROKEN_MBSTOWCS
+    return (int)wcslen(buf);
+#else
     return (int)r1;
-    
+#endif
 }
 #endif