diff options
author | Martin Mares <mj@ucw.cz> | 2020-01-25 20:42:03 +0100 |
---|---|---|
committer | Martin Mares <mj@ucw.cz> | 2020-01-25 20:42:39 +0100 |
commit | 726b641b0dd842b920f7e1c985cb4a22494fe466 (patch) | |
tree | 0d04f31c17a64e279d39417902a9b7a308fdf4f1 | |
parent | 0a9133703e4db04fe52bf7fa774392b82d51ac04 (diff) | |
download | pciutils-726b641b0dd842b920f7e1c985cb4a22494fe466.tar.gz |
VPD: When printing item IDs, escape non-ASCII characters
-rw-r--r-- | ls-vpd.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -10,6 +10,7 @@ */ #include <stdio.h> +#include <string.h> #include "lspci.h" @@ -156,13 +157,14 @@ cap_vpd(struct device *d) { word read_len; const struct vpd_item *item; - byte id1, id2; + byte id[2], id1, id2; if (!read_vpd(d, res_addr + part_pos, buf, 3, &csum)) break; part_pos += 3; - id1 = buf[0]; - id2 = buf[1]; + memcpy(id, buf, 2); + id1 = id[0]; + id2 = id[1]; part_len = buf[2]; if (part_len > res_len - part_pos) break; @@ -178,7 +180,9 @@ cap_vpd(struct device *d) if (!read_vpd(d, res_addr + part_pos, buf, read_len, &csum)) break; - printf("\t\t\t[%c%c] %s: ", id1, id2, item->name); + printf("\t\t\t["); + print_vpd_string(id, 2); + printf("] %s: ", item->name); switch (item->format) { |