arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-27 10:22:37 +00:00
Code Issues Releases Wiki Activity

Do not use term colors if output is not terminal

Browse Source
This commit is contained in:
Dávid Bolvanský 2022-03-18 15:54:26 +01:00
parent 98b89e43d1
commit 672fb2de4b
3 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/terminal.h
View File

@ -46,6 +46,8 @@ int tty_break(void);
int tty_getchar(void); int tty_getchar(void);
int tty_fix(void); int tty_fix(void);
bool is_stdout_terminal(void);
void compress_terminal_line_length (char *out_buf, const size_t keep_from_beginning, const size_t keep_from_end); void compress_terminal_line_length (char *out_buf, const size_t keep_from_beginning, const size_t keep_from_end);
void hash_info (hashcat_ctx_t *hashcat_ctx); void hash_info (hashcat_ctx_t *hashcat_ctx);

80
src/main.c
View File

@ -30,6 +30,8 @@ int _dowildcard = -1;
static void main_log_clear_line (MAYBE_UNUSED const size_t prev_len, MAYBE_UNUSED FILE *fp) static void main_log_clear_line (MAYBE_UNUSED const size_t prev_len, MAYBE_UNUSED FILE *fp)
{ {
if (!is_stdout_terminal()) return;
#if defined (_WIN) #if defined (_WIN)
fputc ('\r', fp); fputc ('\r', fp);
@ -69,61 +71,63 @@ static void main_log (hashcat_ctx_t *hashcat_ctx, FILE *fp, const int loglevel)
} }
// color stuff pre // color stuff pre
if (is_stdout_terminal()) {
#if defined (_WIN) #if defined (_WIN)
HANDLE hConsole = GetStdHandle (STD_OUTPUT_HANDLE); HANDLE hConsole = GetStdHandle (STD_OUTPUT_HANDLE);
CONSOLE_SCREEN_BUFFER_INFO con_info; CONSOLE_SCREEN_BUFFER_INFO con_info;
GetConsoleScreenBufferInfo (hConsole, &con_info); GetConsoleScreenBufferInfo (hConsole, &con_info);
const int orig = con_info.wAttributes; const int orig = con_info.wAttributes;
switch (loglevel) switch (loglevel)
{ {
case LOGLEVEL_INFO: case LOGLEVEL_INFO:
break; break;
case LOGLEVEL_WARNING: SetConsoleTextAttribute (hConsole, 6); case LOGLEVEL_WARNING: SetConsoleTextAttribute (hConsole, 6);
break; break;
case LOGLEVEL_ERROR: SetConsoleTextAttribute (hConsole, FOREGROUND_RED | FOREGROUND_INTENSITY); case LOGLEVEL_ERROR: SetConsoleTextAttribute (hConsole, FOREGROUND_RED | FOREGROUND_INTENSITY);
break; break;
case LOGLEVEL_ADVICE: SetConsoleTextAttribute (hConsole, 6); case LOGLEVEL_ADVICE: SetConsoleTextAttribute (hConsole, 6);
break; break;
} }
#else #else
switch (loglevel) switch (loglevel)
{ {
case LOGLEVEL_INFO: break; case LOGLEVEL_INFO: break;
case LOGLEVEL_WARNING: fwrite ("\033[33m", 5, 1, fp); break; case LOGLEVEL_WARNING: fwrite ("\033[33m", 5, 1, fp); break;
case LOGLEVEL_ERROR: fwrite ("\033[31m", 5, 1, fp); break; case LOGLEVEL_ERROR: fwrite ("\033[31m", 5, 1, fp); break;
case LOGLEVEL_ADVICE: fwrite ("\033[33m", 5, 1, fp); break; case LOGLEVEL_ADVICE: fwrite ("\033[33m", 5, 1, fp); break;
} }
#endif #endif
}
// finally, print // finally, print
fwrite (msg_buf, msg_len, 1, fp); fwrite (msg_buf, msg_len, 1, fp);
// color stuff post // color stuff post
if (is_stdout_terminal()) {
#if defined (_WIN) #if defined (_WIN)
switch (loglevel) switch (loglevel)
{ {
case LOGLEVEL_INFO: break; case LOGLEVEL_INFO: break;
case LOGLEVEL_WARNING: SetConsoleTextAttribute (hConsole, orig); break; case LOGLEVEL_WARNING: SetConsoleTextAttribute (hConsole, orig); break;
case LOGLEVEL_ERROR: SetConsoleTextAttribute (hConsole, orig); break; case LOGLEVEL_ERROR: SetConsoleTextAttribute (hConsole, orig); break;
case LOGLEVEL_ADVICE: SetConsoleTextAttribute (hConsole, orig); break; case LOGLEVEL_ADVICE: SetConsoleTextAttribute (hConsole, orig); break;
} }
#else #else
switch (loglevel) switch (loglevel)
{ {
case LOGLEVEL_INFO: break; case LOGLEVEL_INFO: break;
case LOGLEVEL_WARNING: fwrite ("\033[0m", 4, 1, fp); break; case LOGLEVEL_WARNING: fwrite ("\033[0m", 4, 1, fp); break;
case LOGLEVEL_ERROR: fwrite ("\033[0m", 4, 1, fp); break; case LOGLEVEL_ERROR: fwrite ("\033[0m", 4, 1, fp); break;
case LOGLEVEL_ADVICE: fwrite ("\033[0m", 4, 1, fp); break; case LOGLEVEL_ADVICE: fwrite ("\033[0m", 4, 1, fp); break;
} }
#endif #endif
}
// eventual newline // eventual newline

9
src/terminal.c
View File

@ -600,6 +600,15 @@ int tty_fix ()
} }
#endif #endif
bool is_stdout_terminal(void)
{
#if defined(_WIN)
return _isatty(_fileno(stdout));
#else
return isatty(fileno(stdout));
#endif
}
void compress_terminal_line_length (char *out_buf, const size_t keep_from_beginning, const size_t keep_from_end) void compress_terminal_line_length (char *out_buf, const size_t keep_from_beginning, const size_t keep_from_end)
{ {
const size_t target_len = TERMINAL_LINE_LENGTH - keep_from_beginning; const size_t target_len = TERMINAL_LINE_LENGTH - keep_from_beginning;