diff options
| author | khali <khali> | 2015-04-27 08:47:41 +0000 |
|---|---|---|
| committer | khali <khali> | 2015-04-27 08:47:41 +0000 |
| commit | e5338895325928f5625d258c74659007d6e3dd9c (patch) | |
| tree | 4d93e1637dd30b0ad66c661dcab15ea06026499e | |
| parent | 11d40ab4145a5ca3af15955b8cc5f50685ca3497 (diff) | |
| download | dmidecode-e5338895325928f5625d258c74659007d6e3dd9c.tar.gz | |
dmidecode: Fix --dump-bin when reading from sysfs
FLAG_NO_FILE_OFFSET must be honored also in --dump-bin mode.
As a side effect, the --dump-bin mode becomes a little more verbose by
default, but I don't think this is a problem. It can still be silenced
completely with -q if needed.
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | dmidecode.c | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2015-04-27 Jean Delvare <jdelvare@suse.de> + * dmidecode.c: Fix --dump-bin when reading from sysfs. + +2015-04-27 Jean Delvare <jdelvare@suse.de> + Update to support SMBIOS specification version 3.0.0. * dmidecode.c: Add support for the new _SM3_ 64-bit entry point diff --git a/dmidecode.c b/dmidecode.c index 4ababd7..4569220 100644 --- a/dmidecode.c +++ b/dmidecode.c @@ -4387,12 +4387,6 @@ static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem, SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF); } - if (opt.flags & FLAG_DUMP_BIN) - { - dmi_table_dump(base, len, devmem); - return; - } - if (!(opt.flags & FLAG_QUIET)) { if (opt.type == NULL) @@ -4416,6 +4410,12 @@ static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem, if (flags & FLAG_NO_FILE_OFFSET) base = 0; + if (opt.flags & FLAG_DUMP_BIN) + { + dmi_table_dump(base, len, devmem); + return; + } + if ((buf = mem_chunk(base, len, devmem)) == NULL) { fprintf(stderr, "Table is unreachable, sorry." |