From 46df5b1baeb806f840d44fe06e0d71e335a5aebf Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 9 Feb 2011 12:49:19 +0100 Subject: ata_id: do not print empty serial numbers to avoid unwanted trailing '_' --- extras/ata_id/ata_id.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'extras/ata_id') diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 92387e5077..594cfb2017 100644 --- a/extras/ata_id/ata_id.c +++ b/extras/ata_id/ata_id.c @@ -584,8 +584,12 @@ int main(int argc, char *argv[]) printf("ID_MODEL=%s\n", model); printf("ID_MODEL_ENC=%s\n", model_enc); printf("ID_REVISION=%s\n", revision); - printf("ID_SERIAL=%s_%s\n", model, serial); - printf("ID_SERIAL_SHORT=%s\n", serial); + if (serial[0] != '\0') { + printf("ID_SERIAL=%s_%s\n", model, serial); + printf("ID_SERIAL_SHORT=%s\n", serial); + } else { + printf("ID_SERIAL=%s\n", model); + } if (id.command_set_1 & (1<<5)) { printf ("ID_ATA_WRITE_CACHE=1\n"); -- cgit v1.2.3-54-g00ecf