summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/gpt.c
diff options
context:
space:
mode:
authorKarel Zak2015-06-08 17:26:31 +0200
committerKarel Zak2015-06-08 17:26:31 +0200
commit7c43fd23ce308698d4ad7c061db6bd9ad65cc92a (patch)
tree8b7d08986301c0477951bb46bcc46ef0d1ad9df3 /libfdisk/src/gpt.c
parentlibfdisk: (dos) fix tiny partitions calculation (diff)
downloadkernel-qcow2-util-linux-7c43fd23ce308698d4ad7c061db6bd9ad65cc92a.tar.gz
kernel-qcow2-util-linux-7c43fd23ce308698d4ad7c061db6bd9ad65cc92a.tar.xz
kernel-qcow2-util-linux-7c43fd23ce308698d4ad7c061db6bd9ad65cc92a.zip
libfdisk: improve +0 partition size
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/gpt.c')
-rw-r--r--libfdisk/src/gpt.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index e3b86cb1f..e9798bdf6 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -2147,6 +2147,8 @@ static int gpt_add_partition(
ask = fdisk_new_ask();
else
fdisk_reset_ask(ask);
+ if (!ask)
+ return -ENOMEM;
fdisk_ask_set_query(ask, _("Last sector, +sectors or +size{K,M,G,T,P}"));
fdisk_ask_set_type(ask, FDISK_ASKTYPE_OFFSET);
@@ -2162,15 +2164,14 @@ static int gpt_add_partition(
user_l = fdisk_ask_number_get_result(ask);
if (fdisk_ask_number_is_relative(ask)) {
+ if (user_l == user_f) {
+ fdisk_warnx(cxt, _("Value out of range."));
+ continue; /* +0 */
+ }
user_l = fdisk_align_lba_in_range(cxt, user_l, user_f, dflt_l);
if (user_l > user_f)
user_l -= 1;
-
- /* no space for anything useful, use all space
- if (user_l + (cxt->grain / cxt->sector_size) > dflt_l)
- user_l = dflt_l;
- */
}
if (user_l >= user_f && user_l <= disk_l)