Changeset 1136 for trunk/dmi.c

Timestamp:

08/08/10 23:56:52 (22 months ago)

Author:

mkarcher

Message:

Add dmidecode quirk workaround

dmidecode emits a warning message about unsupported SMBIOS versions
to stdout before the information asked for when using "-s". I consider
this behaviour broken, but we still need to workaround it as e.g. Fedora
currently distributes an dmidecode with this behaviour.

Signed-off-by: Michael Karcher <flashrom@…>
Acked-by: Sean Nelson <audiohacked@…>

File:

• trunk/dmi.c (modified) (1 diff)

trunk/dmi.c

@@ -77 +77 @@
                 return NULL;
         }
-        if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe)) {
-                if(ferror(dmidecode_pipe)) {
-                        msg_perr("DMI pipe read error\n");
-                        pclose(dmidecode_pipe);
-                        return NULL;
-                } else {
-                        answerbuf[0] = 0;       /* Hit EOF */
+
+        /* Kill lines starting with '#', as recent dmidecode versions
+           have the quirk to emit a "# SMBIOS implementations newer..."
+           message even on "-s" if the SMBIOS declares a
+           newer-than-supported version number, while it *should* only print
+           the requested string. */
+        do {
+                if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe)) {
+                        if(ferror(dmidecode_pipe)) {
+                                msg_perr("DMI pipe read error\n");
+                                pclose(dmidecode_pipe);
+                                return NULL;
+                        } else {
+                                answerbuf[0] = 0;       /* Hit EOF */
+                        }
                 }
-        }
+        } while(answerbuf[0] == '#');
+
         /* Toss all output above DMI_MAX_ANSWER_LEN away to prevent
            deadlock on pclose. */