diff --git a/lsscsi.c b/lsscsi.c index fce01a8..0db0587 100644 --- a/lsscsi.c +++ b/lsscsi.c @@ -370,6 +370,11 @@ block_scan(const char * dir_name, const struct lsscsi_opt_coll * opts) for (k = 0; k < num; ++k) free(namelist[k]); free(namelist); + /* Add bdev name if path is block/sda instead of block:sda (2.6.34+) */ + if (num && strstr(aa_block.name, ":") == 0) { + strcat(aa_block.name, "/"); + strcat(aa_block.name, aa_first.name); + } return num; } @@ -2228,12 +2233,6 @@ one_sdev_entry(const char * dir_name, const char * devname, if (opts->size && block_scan(buff, opts) && if_directory_chdir(buff, aa_block.name)) { char value[NAME_LEN_MAX]; - char blkdir[NAME_LEN_MAX]; - -fprintf(stderr, "buff: %s, aa_block.name: %s\n", buff, aa_block.name); - strncpy(blkdir, buff, NAME_LEN_MAX); - strcat(blkdir, "/"); - strcat(blkdir, aa_block.name); if (get_value(".", "size", value, NAME_LEN_MAX)) { u64 blocks = atol(value);