checking in a few changes which make the changes work

This commit was SVN r3478.

src/util/os_path.c

@@ -51,9 +51,12 @@ char *ompi_os_path(bool relative, ...)
         path[0] = 0;
 	if (relative) {
 	    strcpy(path, ".");
+        strcat(path, ompi_system_info.path_sep);
 	}
 	else {
+#ifndef WIN32
 	    strcpy(path, ompi_system_info.path_sep);
+#endif
 	}
 	return(path);
     }
@@ -75,6 +78,12 @@ char *ompi_os_path(bool relative, ...)
 	strcpy(path, ".");
     }
 
+    /* get the first element here so that we don't have duplicate first
+       seperators */
+    if (NULL != (element = va_arg(ap1, char*))) {
+        strcat(path, element);    
+    }
+
     while (NULL != (element=va_arg(ap1, char*))) {
     	strcat(path, ompi_system_info.path_sep);
         strcat(path, element);

src/util/session_dir.c

@@ -75,7 +75,7 @@ static bool ompi_is_empty(char *pathname);
 
 
 
-#define OMPI_DEFAULT_TMPDIR "tmp"
+#define OMPI_DEFAULT_TMPDIR "C:\\cygwin\\tmp"
 
 static int ompi_check_dir(bool create, char *directory)
 {
@@ -155,7 +155,7 @@ int ompi_session_dir(bool create, char *prfx, char *usr, char *hostid,
     }
 
     if (NULL == ompi_process_info.top_session_dir) {
-	if (0 > asprintf(&frontend, "openmpi-sessions-%s@%s:%s", user, hostname, batchname)) {
+	if (0 > asprintf(&frontend, "openmpi-sessions-%s@%s_%s", user, hostname, batchname)) {
 	    return_code = OMPI_ERROR;
 	    goto CLEANUP;
 	}

src/win32/generated_include/allocator_static-components.h

@@ -3,8 +3,10 @@
  */
 
 extern const mca_base_component_t mca_allocator_bucket_component;
+extern const mca_base_component_t mca_allocator_basic_component;
 
 const mca_base_component_t *mca_allocator_base_static_components[] = {
   &mca_allocator_bucket_component, 
+  &mca_allocator_basic_component, 
   NULL
 };

src/win32/ompi_util.h

@@ -18,6 +18,10 @@ static __inline int getpagesize(void) {
 static __inline char *basename(char *path) {
     char *p = path;
     char *ret;
+
+    if (path[strlen(path)-1] == '\\') {
+        path[strlen(path)-1] = '\0';
+    }
     
     while (*p != '\0') p++;
     while (*p != '\\') p--;

vcproj/ompi/ompi.vcproj

@@ -2452,6 +2452,12 @@
 			<Filter
 				Name="components"
 				Filter="">
+				<File
+					RelativePath="..\..\src\mca\allocator\basic\allocator_basic.c">
+				</File>
+				<File
+					RelativePath="..\..\src\mca\allocator\basic\allocator_basic.h">
+				</File>
 				<File
 					RelativePath="..\..\src\mca\allocator\bucket\allocator_bucket.c">
 				</File>