From: Karel Zak <kzak@redhat.com>
Date: Wed, 28 Apr 2010 08:10:39 +0000 (+0200)
Subject: fdisk: improve add partition dialog
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=147e1e73c9af693b025b386f68f14f08dc30a4a9;p=util-linux

fdisk: improve add partition dialog

old version:
	Partition number (1-4):

new version:
	Partition number (1-4, default 1):

where the default value is the first non-used primary partition.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index f5c67904..f2e69dd9 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1522,11 +1522,11 @@ read_int(unsigned int low, unsigned int dflt, unsigned int high,
 
 
 int
-get_partition(int warn, int max) {
+get_partition_dflt(int warn, int max, int dflt) {
 	struct pte *pe;
 	int i;
 
-	i = read_int(1, 0, max, 0, _("Partition number")) - 1;
+	i = read_int(1, dflt, max, 0, _("Partition number")) - 1;
 	pe = &ptes[i];
 
 	if (warn) {
@@ -1543,6 +1543,11 @@ get_partition(int warn, int max) {
 	return i;
 }
 
+int
+get_partition(int warn, int max) {
+	return get_partition_dflt(warn, max, 0);
+}
+
 static int
 get_existing_partition(int warn, int max) {
 	int pno = -1;
@@ -1573,14 +1578,17 @@ static int
 get_nonexisting_partition(int warn, int max) {
 	int pno = -1;
 	int i;
+	int dflt = 0;
 
 	for (i = 0; i < max; i++) {
 		struct pte *pe = &ptes[i];
 		struct partition *p = pe->part_table;
 
 		if (p && is_cleared_partition(p)) {
-			if (pno >= 0)
+			if (pno >= 0) {
+				dflt = pno + 1;
 				goto not_unique;
+			}
 			pno = i;
 		}
 	}
@@ -1592,7 +1600,7 @@ get_nonexisting_partition(int warn, int max) {
 	return -1;
 
  not_unique:
-	return get_partition(warn, max);
+	return get_partition_dflt(warn, max, dflt);
 }
 
 const char *