diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-04-17 22:29:13 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-04-17 22:29:13 +0000 |
commit | 75994f23182e7c75cb1f85b1214592cf8615cc3d (patch) | |
tree | 5cec0edde3f3fefba738813873653562d8846c1e /miscutils/hdparm.c | |
parent | 578d9e6752d3eabc83b6dc2eafa7dfb8a615b937 (diff) | |
download | busybox-w32-75994f23182e7c75cb1f85b1214592cf8615cc3d.tar.gz busybox-w32-75994f23182e7c75cb1f85b1214592cf8615cc3d.tar.bz2 busybox-w32-75994f23182e7c75cb1f85b1214592cf8615cc3d.zip |
Patch from Tito to fix printing null and make output look like hdparm 6.3.
git-svn-id: svn://busybox.net/trunk/busybox@14902 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r-- | miscutils/hdparm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 7c80cf681..c948d142e 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -291,8 +291,8 @@ static const char * const minor_str[] = { /* word 81 value: */ | |||
291 | "Reserved", /* 0x001a */ | 291 | "Reserved", /* 0x001a */ |
292 | "ATA/ATAPI-6 T13 1410D revision 2", /* 0x001b */ | 292 | "ATA/ATAPI-6 T13 1410D revision 2", /* 0x001b */ |
293 | "ATA/ATAPI-6 T13 1410D revision 1", /* 0x001c */ | 293 | "ATA/ATAPI-6 T13 1410D revision 1", /* 0x001c */ |
294 | "reserved" /* 0x001d */ | 294 | "reserved", /* 0x001d */ |
295 | "reserved" /* 0x001e */ | 295 | "reserved", /* 0x001e */ |
296 | "reserved" /* 0x001f-0xfffe*/ | 296 | "reserved" /* 0x001f-0xfffe*/ |
297 | }; | 297 | }; |
298 | #endif | 298 | #endif |
@@ -1427,10 +1427,10 @@ static void dump_identity (const struct hd_driveid *id) | |||
1427 | { | 1427 | { |
1428 | printf("\n Drive conforms to: "); | 1428 | printf("\n Drive conforms to: "); |
1429 | if_else_printf((id->minor_rev_num <= 31),"%s: ","unknown: ", minor_str[id->minor_rev_num]); | 1429 | if_else_printf((id->minor_rev_num <= 31),"%s: ","unknown: ", minor_str[id->minor_rev_num]); |
1430 | if (id->major_rev_num < 31) | 1430 | if (id->major_rev_num != 0x0000 && /* NOVAL_0 */ |
1431 | { | 1431 | id->major_rev_num != 0xFFFF) { /* NOVAL_1 */ |
1432 | for (i=0; i <= 15; i++) | 1432 | for (i=0; i <= 15; i++) |
1433 | if_printf((id->major_rev_num & (1<<i))," %u", i); | 1433 | if_printf((id->major_rev_num & (1<<i))," ATA/ATAPI-%u", i); |
1434 | } | 1434 | } |
1435 | } | 1435 | } |
1436 | #endif /* __NEW_HD_DRIVE_ID */ | 1436 | #endif /* __NEW_HD_DRIVE_ID */ |