Merge branch 'master' of ssh://git.10gen.com/data/gitroot/p

2 files changed, 24 insertions, 9 deletions

diff --git a/db/db.cpp b/db/db.cpp
index 0960e5c9cbb..240a71c3480 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -767,16 +767,25 @@ void initAndListen(int listenPort, const char *dbPath, const char *appserverLoc
 #endif
 
     /*
-     * ensure that the dbpath ends w/ '/' as that's key in preventing things like 
-     *    /data/dbadmin.ns
+     * ensure that the dbpath ends with a path delim if not supplied
+     * @TODO - the following is embarassing - not sure of there's a clean way to
+     * find the platform delim
      */
+
+	char endchar = '/';
+	char *endstr = "/";
+
+#if defined(_WIN32)
+    endchar = '\\';
+    endstr = "\\";
+#endif
     
-    if (dbPath && dbPath[strlen(dbPath)-1] != '/') {
+    if (dbPath && dbPath[strlen(dbPath)-1] != endchar) {
     	char *t = (char *) malloc(strlen(dbPath) + 2);
-    	
-    	strcpy(t, dbPath);
-    	strcat(t, "/");
-    	dbPath = t;
+
+        strcpy(t, dbPath);
+        strcat(t, endstr);
+        dbPath = t;
     }
 
     dbpath = dbPath;
diff --git a/db/javajs.cpp b/db/javajs.cpp
index 730bb8f29d2..7856b69d9f9 100644
--- a/db/javajs.cpp
+++ b/db/javajs.cpp
@@ -378,8 +378,14 @@ void jasserted(const char *msg, const char *file, unsigned line) {
 const char* findEd(const char *path) {
 
 #if defined(_WIN32)
-	log() << "    WIN32 default : c:/l/ed/" << endl;
-	return "c:/l/ed";
+
+	if (!path) {
+		path = findEd();
+	}
+
+	// @TODO check validity
+
+	return path;
 #else
 
 	if (!path) {