diff options
author | Xin Li <delphij@google.com> | 2019-06-17 16:01:49 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-17 16:01:49 -0700 |
commit | ee6314d5022f395224b6ba5f67aedbde63b71d57 (patch) | |
tree | 0436757a5db04cf40f06152b6afc213e1dd3ebdf | |
parent | 540f1a8abfc1b5a3f1520caca0d17f74c08b8327 (diff) | |
parent | a2f7ac0e95748778106f05bd5b77f9a492fac23b (diff) | |
download | fsck_msdos-ee6314d5022f395224b6ba5f67aedbde63b71d57.tar.gz |
Merge "Sync with upstream 95647bc8:" am: 20ad1ebc31 am: 7387ebee3f
am: a2f7ac0e95
Change-Id: Iffcb816bae771ed7c0c9f3c1b4b78259bc65e410
-rw-r--r-- | main.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -129,9 +129,10 @@ ask(int def, const char *fmt, ...) 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 @@ ask(int def, const char *fmt, ...) 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); |