Snap for 5691688 from 09980abea745ade1cee73d49a8e533643df62042 to qt-aml-release
Change-Id: I331edb74611f6d8b62cc510a6bac620429b363d8
diff --git a/main.c b/main.c
index 8425d8a..6802afc 100644
--- a/main.c
+++ b/main.c
@@ -87,16 +87,15 @@
exit(5);
case 'n':
alwaysno = 1;
- alwaysyes = preen = 0;
+ alwaysyes = 0;
break;
case 'y':
alwaysyes = 1;
- alwaysno = preen = 0;
+ alwaysno = 0;
break;
case 'p':
preen = 1;
- alwaysyes = alwaysno = 0;
break;
default:
@@ -130,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;
@@ -141,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);
