facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand UTIL_requireUserConfirmation to include stdin input check

Browse Source
This commit is contained in:
senhuang42 2020-09-24 15:58:06 -04:00
parent 432186cbea
commit 93d63eaeb8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/fileio.c
View File

@ -662,7 +662,7 @@ FIO_openDstFile(FIO_ctx_t* fCtx, FIO_prefs_t* const prefs,
return NULL; return NULL;
} }
DISPLAY("zstd: %s already exists; ", dstFileName); DISPLAY("zstd: %s already exists; ", dstFileName);
if (UTIL_requireUserConfirmation("overwrite (y/n) ? ", "Not overwritten \n", "yY")) if (UTIL_requireUserConfirmation("overwrite (y/n) ? ", "Not overwritten \n", "yY", fCtx->hasStdinInput))
return NULL; return NULL;
} }
/* need to unlink */ /* need to unlink */
@ -859,7 +859,7 @@ static int FIO_removeMultiFilesWarning(FIO_ctx_t* const fCtx, const FIO_prefs_t*
} }
DISPLAYLEVEL(2, "\nThe concatenated output CANNOT regenerate the original directory tree. ") DISPLAYLEVEL(2, "\nThe concatenated output CANNOT regenerate the original directory tree. ")
if (prefs->removeSrcFile) { if (prefs->removeSrcFile) {
error = g_display_prefs.displayLevel > displayLevelCutoff && UTIL_requireUserConfirmation("This is a destructive operation. Proceed? (y/n): ", "Aborting...", "yY"); error = g_display_prefs.displayLevel > displayLevelCutoff && UTIL_requireUserConfirmation("This is a destructive operation. Proceed? (y/n): ", "Aborting...", "yY", fCtx->hasStdinInput);
} }
} }
DISPLAY("\n"); DISPLAY("\n");

5
programs/util.c
View File

@ -88,9 +88,12 @@ UTIL_STATIC void* UTIL_realloc(void *ptr, size_t size)
int g_utilDisplayLevel; int g_utilDisplayLevel;
int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg,
const char* acceptableLetters) { const char* acceptableLetters, int hasStdinInput) {
int ch, result; int ch, result;
if (hasStdinInput)
return 1;
UTIL_DISPLAY("%s", prompt); UTIL_DISPLAY("%s", prompt);
ch = getchar(); ch = getchar();
result = 0; result = 0;

3
programs/util.h
View File

@ -96,8 +96,9 @@ extern int g_utilDisplayLevel;
/** /**
* Displays a message prompt and returns success (0) if first character from stdin * Displays a message prompt and returns success (0) if first character from stdin
* matches any from acceptableLetters. Otherwise, returns failure (1) and displays abortMsg. * matches any from acceptableLetters. Otherwise, returns failure (1) and displays abortMsg.
* If any of the inputs are stdin itself, then automatically return failure (1).
*/ */
int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, const char* acceptableLetters); int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, const char* acceptableLetters, int hasStdinInput);
/*-**************************************** /*-****************************************