hotplug_macosx: handle UTF-8 in ifdFriendlyName

If CFStringGetCStringPtr() fails then we try to copy the sting using kCFStringEncodingUTF8 encoding. This allows to get reader friendly name like "SoloKeys Solo 🐝".
LudovicRousseau · May 16, 2020 · 047789c · 047789c
1 parent 6d0b167
commit 047789c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/hotplug_macosx.c b/src/hotplug_macosx.c
@@ -296,9 +296,17 @@ static HPDriverVector HPDriversGetFromDirectory(const char *driverBundlePath)
 				const char *cstr = CFStringGetCStringPtr(strValue,
 					CFStringGetSystemEncoding());
 				if (NULL == cstr)
-					continue;
+				{
+					char utf8_str[200];
+					if (CFStringGetCString(strValue, utf8_str, sizeof utf8_str,
+						kCFStringEncodingUTF8))
+						driverBundle->m_friendlyName = strdup(utf8_str);
+					else
+						continue;
+				}
+				else
+					driverBundle->m_friendlyName = strdup(cstr);
 
-				driverBundle->m_friendlyName = strdup(cstr);
 				if (!driverBundle->m_libPath)
 					driverBundle->m_libPath = strdup(libPath);