* The build's UpdateMimeInfoThread can now also run on BeOS (which obviously returns

B_NAME_NOT_FOUND instead of B_ENTRY_NOT_FOUND for all missing types).
* Also, BMimeType::GuessMimeType() doesn't seem to work at all under BeOS.
* The build's MIME updater no longer ignores the error from DoMimeUpdate() - so that
  you'll now may get error messages during the build.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19202 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/build/libbe/storage/mime/MimeUpdateThread.cpp

@@ -174,10 +174,9 @@ MimeUpdateThread::UpdateEntry(const entry_ref *ref)
 	      && (device_is_root_device(ref->device)
 	            || DeviceSupportsAttributes(ref->device))) {	
 		// Update this entry
-		if (!err) {
+		if (!err)
-			// R5 appears to ignore whether or not the update succeeds.
+			err = DoMimeUpdate(ref, &entryIsDir);
-			DoMimeUpdate(ref, &entryIsDir);
+
-		}
 		// If we're recursing and this is a directory, update
 		// each of the directory's children as well
 		if (!err && fRecursive && entryIsDir) {		

src/build/libbe/storage/mime/UpdateMimeInfoThread.cpp

@@ -51,8 +51,14 @@ update_icon(BAppFileInfo &appFileInfoRead, BAppFileInfo &appFileInfoWrite,
 	status_t err = appFileInfoRead.GetIconForType(type, &icon, iconSize);
 	if (err == B_OK)
 		err = appFileInfoWrite.SetIconForType(type, &icon, iconSize);
-	else if (err == B_ENTRY_NOT_FOUND)
+	else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND) {
 		err = appFileInfoWrite.SetIconForType(type, NULL, iconSize);
+#if defined(HAIKU_HOST_PLATFORM_DANO) || defined(HAIKU_HOST_PLATFORM_BEOS) && defined(HAIKU_HOST_PLATFORM_BONE)
+		// gives an error if the attribute didn't exist yet...
+		err = B_OK;
+#endif
+	}
+
 	return err;
 }
 
@@ -101,6 +107,63 @@ update_vector_icon(BFile& file, const char *type)
 }
 
 
+#if defined(HAIKU_HOST_PLATFORM_DANO) || defined(HAIKU_HOST_PLATFORM_BEOS) && defined(HAIKU_HOST_PLATFORM_BONE)
+// BMimeType::GuessMimeType() doesn't seem to work under BeOS
+status_t
+guess_mime_type(const void *_buffer, int32 length, BMimeType *type)
+{
+	const uint8 *buffer = (const uint8*)_buffer;
+	if (!buffer || !type)
+		return B_BAD_VALUE;
+
+	// we only know ELF files
+	if (length >= 4 && buffer[0] == 0x7f && buffer[1] == 'E' && buffer[2] == 'L'
+		&&  buffer[3] == 'F') {
+		return type->SetType(B_ELF_APP_MIME_TYPE);
+	}
+
+	return type->SetType(B_FILE_MIME_TYPE);
+}
+
+
+status_t
+guess_mime_type(const entry_ref *ref, BMimeType *type)
+{
+	if (!ref || !type)
+		return B_BAD_VALUE;
+
+	// get BEntry
+	BEntry entry;
+	status_t error = entry.SetTo(ref);
+	if (error != B_OK)
+		return error;
+
+	// does entry exist?
+	if (!entry.Exists())
+		return B_ENTRY_NOT_FOUND;
+
+	// check entry type
+	if (entry.IsDirectory())
+		return type->SetType("application/x-vnd.be-directory");
+	if (entry.IsSymLink())
+		return type->SetType("application/x-vnd.be-symlink");
+	if (!entry.IsFile())
+		return B_ERROR;
+
+	// we have a file, read the first 4 bytes
+	BFile file;
+	char buffer[4];
+	if (file.SetTo(ref, B_READ_ONLY) == B_OK
+		&& file.Read(buffer, 4) == 4) {
+		return guess_mime_type(buffer, 4, type);
+	}
+
+	// we couldn't open or read the file
+	return type->SetType(B_FILE_MIME_TYPE);
+}
+#endif
+
+
 static bool
 is_shared_object_mime_type(BMimeType &type)
 {
@@ -154,6 +217,10 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
 	BMimeType type;
 	if (!err && (updateType || updateAppInfo)) {
 		err = BMimeType::GuessMimeType(entry, &type);
+#if defined(HAIKU_HOST_PLATFORM_DANO) || defined(HAIKU_HOST_PLATFORM_BEOS) && defined(HAIKU_HOST_PLATFORM_BONE)
+		if (err)
+			err = guess_mime_type(entry, &type);
+#endif
 		if (!err)
 			err = type.InitCheck();
 	}
@@ -188,7 +255,7 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
 		err = appFileInfoRead.GetSignature(signature);
 		if (err == B_OK)
 			err = appFileInfoWrite.SetSignature(signature);
-		else if (err == B_ENTRY_NOT_FOUND)
+		else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND)
 			err = appFileInfoWrite.SetSignature(NULL);
 		if (err != B_OK)
 			return err;
@@ -198,7 +265,7 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
 		err = appFileInfoRead.GetAppFlags(&appFlags);
 		if (err == B_OK) {
 			err = appFileInfoWrite.SetAppFlags(appFlags);
-		} else if (err == B_ENTRY_NOT_FOUND) {
+		} else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND) {
 			file.RemoveAttr(kAppFlagsAttribute);
 			err = B_OK;
 		}
@@ -212,8 +279,14 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
 		if (err == B_OK) {
 			err = appFileInfoWrite.SetSupportedTypes(&supportedTypes);
 			hasSupportedTypes = true;
-		} else if (err == B_ENTRY_NOT_FOUND)
+		} else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND) {
+#if defined(HAIKU_HOST_PLATFORM_DANO) || defined(HAIKU_HOST_PLATFORM_BEOS) && defined(HAIKU_HOST_PLATFORM_BONE)
+			file.RemoveAttr(kSupportedTypesAttr);
+			err = B_OK;
+#else
 			err = appFileInfoWrite.SetSupportedTypes(NULL);
+#endif
+		}
 		if (err != B_OK)
 			return err;
 
@@ -251,7 +324,7 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
 			err = appFileInfoRead.GetVersionInfo(&versionInfo, kind);
 			if (err == B_OK)
 				err = appFileInfoWrite.SetVersionInfo(&versionInfo, kind);
-			else if (err == B_ENTRY_NOT_FOUND)
+			else if (err == B_ENTRY_NOT_FOUND || err == B_NAME_NOT_FOUND)
 				err = appFileInfoWrite.SetVersionInfo(NULL, kind);
 			if (err != B_OK)
 				return err;