Index: trunk/i386/libsaio/device_tree.c
===================================================================
--- trunk/i386/libsaio/device_tree.c	(revision 2611)
+++ trunk/i386/libsaio/device_tree.c	(revision 2612)
@@ -379,7 +379,7 @@
 	for (prop = node->properties; prop; prop = prop->next)
 	{
 		//DPRINTF("Prop '%s'\n", prop->name);
-		if (strcmp(prop->name, "name") == 0)
+		if (strncmp(prop->name, "name", sizeof("name")) == 0)
 		{
 			return prop->value;
 		}
@@ -497,7 +497,7 @@
 	for (prop = node->properties; prop; prop = prop->next)
 	{
 		char c = *((char *)prop->value);
-		if (prop->length < 64 && (strcmp(prop->name, "name") == 0 || (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'))
+		if (prop->length < 64 && (strncmp(prop->name, "name", sizeof("name") ) == 0 || (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'))
 		{
 			printf("%s Property '%s' [%d] = '%s'\n", spaces, prop->name, prop->length, prop->value);
 		}
Index: trunk/i386/libsaio/load.c
===================================================================
--- trunk/i386/libsaio/load.c	(revision 2611)
+++ trunk/i386/libsaio/load.c	(revision 2612)
@@ -301,7 +301,7 @@
 		stop("Kernel overflows available space");
 	}
 
-	if (vmsize && ((strcmp(segname, "__PRELINK_INFO") == 0) || (strcmp(segname, "__PRELINK") == 0)))
+	if (vmsize && ((strncmp(segname, "__PRELINK_INFO", sizeof("__PRELINK_INFO")) == 0) || (strncmp(segname, "__PRELINK", sizeof("__PRELINK")) == 0)))
 	{
 		gHaveKernelCache = true;
 	}
Index: trunk/i386/libsaio/disk.c
===================================================================
--- trunk/i386/libsaio/disk.c	(revision 2611)
+++ trunk/i386/libsaio/disk.c	(revision 2612)
@@ -1331,7 +1331,7 @@
 				dpme.dpme_boot_block);
 				*/
 
-				if (strcmp(dpme_p->dpme_type, "Apple_HFS") == 0)
+				if (strncmp(dpme_p->dpme_type, "Apple_HFS", sizeof("Apple_HFS")) == 0)
 				{
 					bvr = newAPMBVRef(biosdev,
 					i,
Index: trunk/i386/libsaio/convert.c
===================================================================
--- trunk/i386/libsaio/convert.c	(revision 2611)
+++ trunk/i386/libsaio/convert.c	(revision 2612)
@@ -13,7 +13,7 @@
 	static char msg[UUID_LEN*2 + 8] = "";
 	if (!eUUID) return "";
 	const unsigned char * uuid = (unsigned char*) eUUID;
-	sprintf(msg, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+	snprintf(msg, sizeof(msg), "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
 		    uuid[0], uuid[1], uuid[2], uuid[3], 
 		    uuid[4], uuid[5], uuid[6], uuid[7],
 		    uuid[8], uuid[9], uuid[10],uuid[11],
Index: trunk/i386/modules/Keylayout/Keylayout.c
===================================================================
--- trunk/i386/modules/Keylayout/Keylayout.c	(revision 2611)
+++ trunk/i386/modules/Keylayout/Keylayout.c	(revision 2612)
@@ -140,7 +140,7 @@
 	{
 		snprintf(layoutPath, sizeof(layoutPath),"/Extra/Keymaps/%s", val);
 		// Add the extension if needed
-		if (len <= 4 || strcmp(val+len-4,".lyt") != 0)
+		if (len <= 4 || strncmp(val+len-4,".lyt", sizeof(".lyt")) != 0)
 			strncat(layoutPath, ".lyt", sizeof(layoutPath) - strlen(layoutPath) - 1);
 
 		if (!load_keyboard_layout_file(layoutPath))