# HG changeset patch
# User Pramod Batni <Pramod.Batni@Sun.COM>
# Date 1246939348 25200
# Node ID 8e9d94399508ace774a964d8eba8bcc31f10d291
# Parent  a9144b04f02d67be3878a4a364068214e9cd7463
6841218 incorrectly generated filename in kobj_open_path leads to needless errors in kobj_open_file

diff -r a9144b04f02d -r 8e9d94399508 usr/src/uts/common/krtld/kobj.c
--- a/usr/src/uts/common/krtld/kobj.c	Tue Jul 07 11:15:24 2009 +0800
+++ b/usr/src/uts/common/krtld/kobj.c	Mon Jul 06 21:02:28 2009 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -3485,9 +3485,11 @@
 			kobj_free(fullname, maxpathlen);
 			return (file);
 		}
+		while (*pathp == ' ')
+			pathp++;
 		if (*pathp == 0)
 			break;
-		pathp++;
+
 	}
 	kobj_free(fullname, maxpathlen);
 	if (_moddebug & MODDEBUG_ERRMSG) {
diff -r a9144b04f02d -r 8e9d94399508 usr/src/uts/sun4/os/mlsetup.c
--- a/usr/src/uts/sun4/os/mlsetup.c	Tue Jul 07 11:15:24 2009 +0800
+++ b/usr/src/uts/sun4/os/mlsetup.c	Mon Jul 06 21:02:28 2009 -0700
@@ -512,11 +512,11 @@
 	 */
 	(void) strcpy(path, "/platform/");
 	(void) strcat(path, platname);
-	(void) strcat(path, "/kernel ");
+	(void) strcat(path, "/kernel");
 	if (!compat) {
-		(void) strcat(path, "/platform/");
+		(void) strcat(path, " /platform/");
 		(void) strcat(path, defname);
-		(void) strcat(path, "/kernel ");
+		(void) strcat(path, "/kernel");
 	}
 	return;