From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Sun, 2 Jan 2011 21:58:12 +0000 (+0100)
Subject: fdisk: quit with a single CTRL-D, confirm if necessary
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aead9d139dc81db70a6a6d72c2163021a3656d74;p=util-linux

fdisk: quit with a single CTRL-D, confirm if necessary

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 5a694373..e1221aaa 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -1316,21 +1316,38 @@ got_dos_table:
 	return 0;
 }
 
+static int is_partition_table_changed(void)
+{
+	int i;
+
+	for (i = 0; i < partitions; i++)
+		if (ptes[i].changed)
+			return 1;
+	return 0;
+}
+
+static void maybe_exit(int rc)
+{
+	char line[LINE_LENGTH];
+
+	putchar('\n');
+
+	if (is_partition_table_changed() || MBRbuffer_changed) {
+		fprintf(stderr, _("Do you really want to quit? "));
+
+		if (!fgets(line, LINE_LENGTH, stdin) || rpmatch(line) == 1)
+			exit(rc);
+	} else
+		exit(rc);
+}
+
 /* read line; return 0 or first char */
 int
 read_line(void)
 {
-	static int got_eof = 0;
-
 	line_ptr = line_buffer;
 	if (!fgets(line_buffer, LINE_LENGTH, stdin)) {
-		if (feof(stdin))
-			got_eof++; 	/* user typed ^D ? */
-		if (got_eof >= 3) {
-			fflush(stdout);
-			fprintf(stderr, _("\ngot EOF thrice - exiting..\n"));
-			exit(1);
-		}
+		maybe_exit(1);
 		return 0;
 	}
 	while (*line_ptr && !isgraph(*line_ptr))