commit 4eef244fcb822a91ce5df3eeb9d27719c328d2d5
author Xin Li <delphij@google.com> Wed Jun 26 15:09:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 26 15:09:04 2019 -0700
tree 2a7a51fda3383a86848454a6e6473a3db6fdccc0
parent 1dfda9dafb2e62787a92a43c3ee5c8b9f309759d
parent 09980abea745ade1cee73d49a8e533643df62042

Sync with upstream 95647bc8:
am: 09980abea7

Change-Id: Ica63752553b101d41486cb958076af5db6ba17ba

main.c

diff --git a/main.c b/main.c
index 2b79cc0..6802afc 100644
--- a/main.c
+++ b/main.c
@@ -129,9 +129,10 @@
 	char prompt[256];
 	int c;
 
+	if (alwaysyes || alwaysno || rdonly)
+		def = (alwaysyes && !rdonly && !alwaysno);
+
 	if (preen) {
-		if (rdonly)
-			def = 0;
 		if (def)
 			printf("FIXED\n");
 		return def;
@@ -140,9 +141,9 @@
 	va_start(ap, fmt);
 	vsnprintf(prompt, sizeof(prompt), fmt, ap);
 	va_end(ap);
-	if (alwaysyes || rdonly) {
-		printf("%s? %s\n", prompt, rdonly ? "no" : "yes");
-		return !rdonly;
+	if (alwaysyes || alwaysno || rdonly) {
+		printf("%s? %s\n", prompt, def ? "yes" : "no");
+		return def;
 	}
 	do {
 		printf("%s? [yn] ", prompt);