diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-17 00:12:10 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-17 00:12:10 +0000 |
| commit | 4437d19fb4d7bd7cd9d8acd5e67d85c8751a6e93 (patch) | |
| tree | 5eb094c94adda9f92cbedac6062b0d0040a5142c /util-linux/fdisk_sun.c | |
| parent | aca10f852ae760a3f2e2b9ed08bd13f9d5b85443 (diff) | |
| download | busybox-4437d19fb4d7bd7cd9d8acd5e67d85c8751a6e93.tar.gz | |
fdisk: do not open device twice. Complain on fdisk -l /dev/bogus.
Made enums UPPERCASE. Removed one global variable.
Added some FIXMEs.
text data bss dec hex filename
804708 645 7112 812465 c65b1 busybox_old
804685 641 7112 812438 c6596 busybox_unstripped
Diffstat (limited to 'util-linux/fdisk_sun.c')
| -rw-r--r-- | util-linux/fdisk_sun.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c index fcd3818d2..e595444c4 100644 --- a/util-linux/fdisk_sun.c +++ b/util-linux/fdisk_sun.c @@ -42,7 +42,7 @@ guess_device_type(void) { struct stat bootstat; - if (fstat(fd, &bootstat) < 0) { + if (fstat(dev_fd, &bootstat) < 0) { scsi_disk = 0; floppy = 0; } else if (S_ISBLK(bootstat.st_mode) @@ -98,7 +98,7 @@ check_sun_label(void) if (sunlabel->magic != SUN_LABEL_MAGIC && sunlabel->magic != SUN_LABEL_MAGIC_SWAPPED) { - current_label_type = label_dos; + current_label_type = LABEL_DOS; sun_other_endian = 0; return 0; } @@ -116,7 +116,7 @@ check_sun_label(void) g_sectors = SUN_SSWAP16(sunlabel->nsect); } update_units(); - current_label_type = label_sun; + current_label_type = LABEL_SUN; g_partitions = 8; return 1; } @@ -168,7 +168,7 @@ sun_autoconfigure_scsi(void) char *q; int i; - if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, &id)) + if (ioctl(dev_fd, SCSI_IOCTL_GET_IDLUN, &id)) return NULL; sprintf(buffer, @@ -272,7 +272,7 @@ create_sunlabel(void) } } if (!p || floppy) { - if (!ioctl(fd, HDIO_GETGEO, &geometry)) { + if (!ioctl(dev_fd, HDIO_GETGEO, &geometry)) { g_heads = geometry.heads; g_sectors = geometry.sectors; g_cylinders = geometry.cylinders; @@ -346,7 +346,7 @@ create_sunlabel(void) set_all_unchanged(); set_changed(0); - get_boot(create_empty_sun); + get_boot(CREATE_EMPTY_SUN); } static void @@ -722,9 +722,9 @@ sun_write_table(void) while (ush < (unsigned short *)(&sunlabel->csum)) csum ^= *ush++; sunlabel->csum = csum; - if (lseek(fd, 0, SEEK_SET) < 0) + if (lseek(dev_fd, 0, SEEK_SET) < 0) fdisk_fatal(unable_to_seek); - if (write(fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE) + if (write(dev_fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE) fdisk_fatal(unable_to_write); } #endif /* SUN_LABEL */ |