openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Add dmidecode quirk workaround

Browse Source 
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.

Corresponding to flashrom svn r1136.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Sean Nelson <audiohacked@gmail.com>
This commit is contained in:
Michael Karcher 2010-08-08 21:56:52 +00:00
parent 243ec63305
commit d9f266d1fb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dmi.c
View File

@ -76,6 +76,13 @@ static char *get_dmi_string(const char *string_name)
msg_perr("DMI pipe open error\n");
return NULL;
}
/* 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");
@ -85,6 +92,8 @@ static char *get_dmi_string(const char *string_name)
answerbuf[0] = 0; /* Hit EOF */
}
}
} while(answerbuf[0] == '#');
/* Toss all output above DMI_MAX_ANSWER_LEN away to prevent
deadlock on pclose. */
while (!feof(dmidecode_pipe))