diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk_osf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index e281ea5d9..30c42553b 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c | |||
| @@ -502,6 +502,8 @@ xbsd_print_disklabel(int show_all) | |||
| 502 | int i, j; | 502 | int i, j; |
| 503 | 503 | ||
| 504 | if (show_all) { | 504 | if (show_all) { |
| 505 | static const int d_masks[] = { BSD_D_REMOVABLE, BSD_D_ECC, BSD_D_BADSECT }; | ||
| 506 | |||
| 505 | #if defined(__alpha__) | 507 | #if defined(__alpha__) |
| 506 | printf("# %s:\n", disk_device); | 508 | printf("# %s:\n", disk_device); |
| 507 | #else | 509 | #else |
| @@ -513,13 +515,8 @@ xbsd_print_disklabel(int show_all) | |||
| 513 | printf("type: %d\n", lp->d_type); | 515 | printf("type: %d\n", lp->d_type); |
| 514 | printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename); | 516 | printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename); |
| 515 | printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname); | 517 | printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname); |
| 516 | printf("flags:"); | 518 | printf("flags: "); |
| 517 | if (lp->d_flags & BSD_D_REMOVABLE) | 519 | print_flags_separated(d_masks, "removable\0""ecc\0""badsect\0", lp->d_flags, " "); |
| 518 | printf(" removable"); | ||
| 519 | if (lp->d_flags & BSD_D_ECC) | ||
| 520 | printf(" ecc"); | ||
| 521 | if (lp->d_flags & BSD_D_BADSECT) | ||
| 522 | printf(" badsect"); | ||
| 523 | bb_putchar('\n'); | 520 | bb_putchar('\n'); |
| 524 | /* On various machines the fields of *lp are short/int/long */ | 521 | /* On various machines the fields of *lp are short/int/long */ |
| 525 | /* In order to avoid problems, we cast them all to long. */ | 522 | /* In order to avoid problems, we cast them all to long. */ |
