Changeset 11856 in vbox for trunk/src/VBox/Main/darwin

Timestamp:

Aug 29, 2008 11:24:22 PM (16 years ago)

Author:

vboxsync

Message:

Main/iokit: Fix for missing AirPort/Wireless in the string. ConsoleImpl2.cpp requires this.

File:

• trunk/src/VBox/Main/darwin/iokit.cpp (modified) (2 diffs)

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1514 +1514 @@
                         *psz++ = ':';
                         *psz++ = ' ';
-                        size_t cchLeft = sizeof(szTmp) - (psz - &szTmp[0]);
+                        size_t cchLeft = sizeof(szTmp) - (psz - &szTmp[0]) - (sizeof(" (Wireless)") - 1);
                         CFIndex i;
                         for (i = 0; i < cIfs; i++)
@@ -1536 +1536 @@
                                         fUSB ? "USB " : "",
                                         fWireless ? fAirPort ? "AirPort " : "Wireless" : "Ethernet");
+                        /* If we did find it and it's wireless but without "AirPort" or "Wireless", fix it */
+                        else if (   fWireless
+                                 && !strstr(szTmp, "AirPort")
+                                 && !strstr(szTmp, "Wireless"))
+                            strcat(szTmp, " (Wireless)");
 
                         /*