d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In ask(): override default option if any of alwaysyes/alwaysno/rdonly is

Browse Source 
set.

MFC after:	2 weeks
This commit is contained in:
Xin LI 2019-06-15 07:23:06 +00:00
parent 1e3ffe6590
commit 0b253f2ba4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349048
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/fsck_msdosfs/main.c
View File

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