eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-17 05:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup: Print message about operation aborted if user did not answer YES.

Browse Source 
Thanks Colin Walters for the initial idea in !33.
This commit is contained in:
Milan Broz
2018-01-24 10:08:44 +01:00
parent 8728ba08e2
commit 4e5e8fd8fe
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils_tools.c
View File

@@ -132,8 +132,9 @@ void quiet_log(int level, const char *msg, void *usrptr)
tool_log(level, msg, usrptr);
}
int yesDialog(const char *msg, void *usrptr __attribute__((unused)))
int yesDialog(const char *msg, void *usrptr)
{
const char *fail_msg = (const char *)usrptr;
char *answer = NULL;
size_t size = 0;
int r = 1, block;
@@ -142,7 +143,7 @@ int yesDialog(const char *msg, void *usrptr __attribute__((unused)))
if (block)
set_int_block(0);
if(isatty(STDIN_FILENO) && !opt_batch_mode) {
if (isatty(STDIN_FILENO) && !opt_batch_mode) {
log_std("\nWARNING!\n========\n");
log_std("%s\n\nAre you sure? (Type uppercase yes): ", msg);
fflush(stdout);
@@ -153,8 +154,11 @@ int yesDialog(const char *msg, void *usrptr __attribute__((unused)))
log_err(_("Error reading response from terminal.\n"));
else
log_dbg("Query interrupted on signal.");
} else if(strcmp(answer, "YES\n"))
} else if (strcmp(answer, "YES\n")) {
r = 0;
if (fail_msg)
log_err("%s", fail_msg);
}
}
if (block && !quit)