From: Karel Zak <kzak@redhat.com>
Date: Thu, 9 Oct 2014 10:23:59 +0000 (+0200)
Subject: sfdisk: ask on EOF
X-Git-Tag: v2.26-rc1~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05af8bd4f060ea39fcf31516459ae5f57e13121b;p=thirdparty%2Futil-linux.git

sfdisk: ask on EOF

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

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 43a081cc00..1f2ad7c492 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -114,7 +114,7 @@ static int ui_menu_move(struct cfdisk *cf, int key);
 static void ui_menu_resize(struct cfdisk *cf);
 
 static int ui_get_size(struct cfdisk *cf, const char *prompt, uintmax_t *res,
-		       uintmax_t low, uintmax_t up);
+		       uintmax_t low, uintmax_t up, int *expsize);
 
 static int ui_enabled;
 static int ui_resize;
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index d49ba5964d..83b9cf57f1 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1275,6 +1275,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
 
 	switch (rc) {
 	case SFDISK_DONE_ASK:
+	case SFDISK_DONE_EOF:
 		if (sf->interactive) {
 			int yes = 0;
 			fdisk_ask_yesno(sf->cxt, _("Do you want to write this to disk?"), &yes);
@@ -1284,7 +1285,6 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
 				break;
 			}
 		}
-	case SFDISK_DONE_EOF:
 	case SFDISK_DONE_WRITE:
 		rc = write_changes(sf);
 		break;