commit 7387ebee3f73cc8a4c73fc95b3f1a0934bbbfd57
author Xin Li <delphij@google.com> Mon Jun 17 15:26:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 17 15:26:48 2019 -0700
tree 0436757a5db04cf40f06152b6afc213e1dd3ebdf
parent 686b91faf302b99dc25007476427d3b843fea4b0
parent 20ad1ebc31f337b60fd4a68ab675bf5afabca625

Merge "Sync with upstream 95647bc8:"
am: 20ad1ebc31

Change-Id: I1dd17c9021a7d712764b777bbb4efa5bf16faa4a

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);