diff options
| author | Karel Zak | 2006-12-07 00:25:41 +0100 |
|---|---|---|
| committer | Karel Zak | 2006-12-07 00:25:41 +0100 |
| commit | eb63b9b8f4cecb34c2478282567862bc48ef256d (patch) | |
| tree | 99243f8eecb44c2bb6a559982b99c680fcb649e7 /fdisk/cfdisk.c | |
| parent | Imported from util-linux-2.9v tarball. (diff) | |
| download | kernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.tar.gz kernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.tar.xz kernel-qcow2-util-linux-eb63b9b8f4cecb34c2478282567862bc48ef256d.zip | |
Imported from util-linux-2.10f tarball.
Diffstat (limited to 'fdisk/cfdisk.c')
| -rw-r--r-- | fdisk/cfdisk.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 4fe759b68..4d0eb7ea4 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -69,7 +69,6 @@ #endif #include <signal.h> #include <math.h> -#include <locale.h> #include <string.h> #include <sys/stat.h> #include <sys/ioctl.h> @@ -89,7 +88,6 @@ typedef long ext2_loff_t; extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset, unsigned int origin); -#include "../version.h" #define VERSION UTIL_LINUX_VERSION #define DEFAULT_DEVICE "/dev/hda" @@ -1316,7 +1314,7 @@ void new_part(int i) int num_sects = last - first + 1; int len, ext, j; char *errmsg; - + double sectors_per_MB = K*K / 512.0; if (p_info[i].num == PRI_OR_LOG) { static struct MenuItem menuPartType[]= @@ -1341,7 +1339,7 @@ void new_part(int i) else print_warning(_("!!! Internal error !!!")); - sprintf(def, "%.2f", ceiling(num_sects/(K*0.02))/100); + sprintf(def, "%.2f", num_sects/sectors_per_MB); mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Size (in MB): ")); if ((len = get_string(response, LINE_LENGTH, def)) <= 0 && len != GS_DEFAULT) @@ -2367,8 +2365,13 @@ void draw_partition(int i) } if (p_info[i].id > 0) { + char *dbn = my_basename(disk_device); + int l = strlen(dbn); + int digit_last = isdigit(dbn[l-1]); + mvprintw(y, NAME_START, - "%s%d", my_basename(disk_device), p_info[i].num+1); + "%s%s%d", dbn, (digit_last ? "p" : ""), + p_info[i].num+1); if (p_info[i].flags) { if (p_info[i].flags == ACTIVE_FLAG) mvaddstr(y, FLAGS_START, _("Boot")); |