From e06814242df16d7cb70b5ae739308b84390aa28c Mon Sep 17 00:00:00 2001 From: dougg Date: Thu, 9 Jul 2020 02:56:11 +0000 Subject: [PATCH] improve NVMe device parsing and make WWN printing for NVMe more consistent git-svn-id: https://svn.bingwo.ca/repos/lsscsi/trunk@163 aaa919c1-9816-4d37-901d-0171dbb97e96 Conflict: origin commit contains three changes: - improve NVMe device parsing (e.g. /dev/nvme0c1n2) - collect_disk_wwn_nodes: Fix WWN string copy - make WWN printing for NVMe more consistent with output from SCSI devices (e.g. with -u and -t) Here we pick the change of collect_disk_wwn_nodes which fix the incorrect output of wwn number Reference:https://github.com/doug-gilbert/lsscsi/commit/e06814242df16d7cb70b5ae739308b84390aa28c Signed-off-by: Wenchao Hao --- src/lsscsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lsscsi.c b/src/lsscsi.c index 1fe1b3e..8fe85df 100644 --- a/src/lsscsi.c +++ b/src/lsscsi.c @@ -1509,7 +1509,7 @@ collect_disk_wwn_nodes(void) } cur_ent = &cur_list->nodes[cur_list->count]; - my_strcopy(cur_ent->wwn, "0x", 2); + my_strcopy(cur_ent->wwn, "0x", 3); my_strcopy(cur_ent->wwn + 2, dep->d_name + 5, sizeof(cur_ent->wwn) - 2); my_strcopy(cur_ent->disk_bname, basename(symlink_path), -- 1.8.3.1