Various core files: Colorize warnings and/or use _ONCE macros

Author: magnumripper

src/bench.c

@@ -279,8 +279,9 @@ static void bench_set_keys(struct fmt_main *format,
 		}
 
 		if (warn == 1) {
-			fprintf(stderr, "Warning: not enough candidates under "
-			    "benchmark length %d\n", length);
+			fprintf_color(color_warning, stderr,
+			              "Warning: not enough candidates under benchmark length %d\n",
+			              length);
 			warn = 2;
 		}
 

src/config.c

@@ -118,11 +118,11 @@ static void cfg_add_section(const char *name)
 			if (!strcmp(last->name, name)) {
 				if (!cfg_loading_john_local) {
 					if (john_main_process)
-						fprintf(stderr, "Warning! john.conf section [%s] is multiple declared.\n", name);
+						fprintf_color(color_warning, stderr, "Warning! john.conf section [%s] is multiple declared.\n", name);
 				}
 #ifndef BENCH_BUILD
 				else if (john_main_process && options.verbosity >= VERB_DEFAULT)
-					fprintf(stderr, "Warning! Section [%s] overridden by john-local.conf\n", name);
+					fprintf_color(color_warning, stderr, "Warning! Section [%s] overridden by john-local.conf\n", name);
 #endif
 				break;
 			}

src/formats.c

@@ -455,9 +455,9 @@ void fmt_init(struct fmt_main *format)
 		if (john_main_process && !(options.flags & FLG_TEST_CHK) &&
 		    !options.listconf && options.target_enc != UTF_8 &&
 		    format->params.flags & FMT_UTF8)
-			fprintf(stderr, "Warning: %s format should always be "
-			        "UTF-8. Use --target-encoding=utf8\n",
-				format->params.label);
+			fprintf_color(color_warning, stderr,
+			              "Warning: %s format should always be UTF-8. Use --target-encoding=utf8\n",
+			              format->params.label);
 
 		if (john_main_process && !(options.flags & FLG_TEST_CHK) && !options.listconf) {
 			if (format->params.flags & FMT_NOT_EXACT) {

src/john.c

@@ -424,13 +424,14 @@ static void john_omp_show_info(void)
 		if (msg) {
 #if OS_FORK
 		if (!(options.flags & (FLG_PIPE_CHK | FLG_STDIN_CHK)))
-			fprintf(stderr, "Warning: %s for this hash type, "
-			    "consider --fork=%d\n",
-			    msg, john_omp_threads_orig);
+			fprintf_color(color_warning, stderr,
+			              "Warning: %s for this hash type, consider --fork=%d\n",
+			              msg, john_omp_threads_orig);
 		else
 #endif
-			fprintf(stderr, "Warning: %s for this hash type\n",
-			    msg);
+			fprintf_color(color_warning, stderr,
+			              "Warning: %s for this hash type\n",
+			              msg);
 		}
 	}
 
@@ -1082,7 +1083,8 @@ static void john_load(void)
 		}
 		if (options.verbosity <= 1)
 			if (john_main_process)
-				fprintf(stderr, "Warning: Verbosity decreased to minimum, candidates will not be printed!\n");
+				fprintf_color(color_warning, stderr,
+				              "Warning: Verbosity decreased to minimum, candidates will not be printed!\n");
 		john_load_conf_db();
 	}
 

src/loader.c

@@ -122,11 +122,10 @@ static MAYBE_INLINE char *check_bom(char *string)
 			        "Warning: UTF-8 BOM seen in password hash file. You probably want --input-encoding=UTF8\n");
 	}
 	if (options.input_enc == UTF_8 && (!memcmp(string, "\xFE\xFF", 2) || !memcmp(string, "\xFF\xFE", 2))) {
-		static int warned;
-
-		if (john_main_process && !warned++)
-			fprintf(stderr, "Warning: UTF-16 BOM seen in password hash file. "
-			        "File may not be read properly unless you re-encode it\n");
+		if (john_main_process)
+			WARN_ONCE(color_warning, stderr,
+			          "Warning: UTF-16 BOM seen in password hash file. "
+			          "File may not be read properly unless you re-encode it\n");
 	}
 	return string;
 }
@@ -254,13 +253,17 @@ static void read_file(struct db_main *db, char *name, int flags,
 			     options.input_enc == UTF_8)) {
 				if (!valid_utf8((UTF8*)u8check)) {
 					warn_enc = 0;
-					fprintf(stderr, "Warning: invalid UTF-8 seen reading %s\n", path_expand(name));
+					fprintf_color(color_warning, stderr,
+					              "Warning: invalid UTF-8 seen reading %s\n",
+					              path_expand(name));
 				}
 			} else if (options.input_enc != UTF_8 &&
 			           (line != line_buf ||
 			            valid_utf8((UTF8*)u8check) > 1)) {
 				warn_enc = 0;
-				fprintf(stderr, "Warning: UTF-8 seen reading %s\n", path_expand(name));
+				fprintf_color(color_warning, stderr,
+				              "Warning: UTF-8 seen reading %s\n",
+				              path_expand(name));
 			}
 		}
 		process_line(db, line);
@@ -1012,18 +1015,13 @@ static void ldr_load_pw_line(struct db_main *db, char *line)
 
 				if (john_main_process) {
 					if (format->params.binary_size)
-					fprintf(stderr, "Warning: "
-					    "excessive partial hash "
-					    "collisions detected\n%s",
-					    db->password_hash_func !=
-					    fmt_default_binary_hash ? "" :
-					    "(cause: the \"format\" lacks "
-					    "proper binary_hash() function "
-					    "definitions)\n");
+					fprintf_color(color_warning, stderr,
+					              "Warning: excessive partial hash collisions detected\n%s",
+					              db->password_hash_func != fmt_default_binary_hash ? "" :
+					              "(cause: the \"format\" lacks proper binary_hash() function definitions)\n");
 					else
-					fprintf(stderr, "Warning: "
-					    "check for duplicates partially "
-					    "bypassed to speedup loading\n");
+					fprintf_color(color_warning, stderr,
+					              "Warning: check for duplicates partially bypassed to speedup loading\n");
 				}
 				dupe_checking = 0;
 				current_pw = NULL; /* no match */