Add some function-like macros for log/warn/both

WARN_ONCE() is like fprintf_color() but only once per session.
WARN_LOG_ONCE() is the same but also logs the same message.

Also add error color to error(), pexit() and similar stuff in misc.c

Author: magnumripper

src/color.c

@@ -9,7 +9,7 @@
 #include "config.h"
 #include "options.h"
 
-char *color_error, *color_notice, *color_warning, *color_end;
+char *color_none, *color_error, *color_notice, *color_warning, *color_end;
 
 /*
  * Translate ^ to Esc, in place.
@@ -34,11 +34,13 @@ char *parse_esc(const char *string)
 
 void color_init()
 {
+	color_none = "";
+
 	if (cfg_get_bool(SECTION_OPTIONS, NULL, "UseColors", 0)) {
 		color_error = parse_esc(cfg_get_param(SECTION_OPTIONS, NULL, "ColorError"));
 		color_notice = parse_esc(cfg_get_param(SECTION_OPTIONS, NULL, "ColorNotice"));
 		color_warning = parse_esc(cfg_get_param(SECTION_OPTIONS, NULL, "ColorWarning"));
 		color_end = parse_esc(cfg_get_param(SECTION_OPTIONS, NULL, "ColorEnd"));
 	} else
-		color_error = color_notice = color_warning = color_end = "";
+		color_error = color_notice = color_warning = color_end = color_none;
 }

src/color.h

@@ -8,11 +8,14 @@
 #ifndef _JOHN_COLOR_H
 #define _JOHN_COLOR_H
 
+#include <stdio.h>
+#include <unistd.h> /* isatty */
+
 extern char *parse_esc(const char *string);
 extern void color_init();
 
 /* Color escape sequences as strings */
-extern char *color_error, *color_notice, *color_warning, *color_end;
+extern char *color_none, *color_error, *color_notice, *color_warning, *color_end;
 
 #define printf_color(color, ...)	fprintf_color(color, stdout, __VA_ARGS__);
 

src/logger.c

@@ -620,7 +620,7 @@ void log_guess(char *login, char *uid, char *ciphertext, char *rep_plain,
 		write_loop(fileno(stderr), "\007", 1);
 }
 
-void log_event(const char *format, ...)
+void log_event_ex(int add_nl, const char *format, ...)
 {
 	va_list args;
 	int count1, count2;
@@ -658,7 +658,8 @@ void log_event(const char *format, ...)
 		va_start(args, format);
 		vfprintf(stderr, format, args);
 		va_end(args);
-		fprintf(stderr, "\n");
+		if (add_nl)
+			fprintf(stderr, "\n");
 		if (options.flags & FLG_NOLOG)
 			return;
 	}

src/logger.h

@@ -19,6 +19,13 @@
 
 #include <fcntl.h>
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
 #if defined(F_SETLK) && defined(F_SETLKW) && defined(F_UNLCK)	  \
 	&& defined(F_RDLCK) && defined(F_WRLCK)
 /*
@@ -50,6 +57,13 @@ extern int log_lock(int fd, int cmd, int type, const char *name,
 #endif /* #if defined(F_SETLK) && defined(F_SETLKW) && defined(F_UNLCK)
 		&& defined(F_RDLCK) && defined(F_WRLCK) */
 
+/*
+ * log_event_ex() first argument is whether to add a newline or not.
+ * Using FALSE is for when the same string is to be sent to log and
+ * screen, so it already contains one.
+ */
+#define log_event(...) log_event_ex(TRUE, __VA_ARGS__)
+
 /*
  * Macro to only log something once per session.
  */
@@ -82,11 +96,11 @@ extern void log_guess(char *login, char *uid, char *ciphertext, char *rep_plain,
  */
 extern
 #if (__GNUC__ == 4 && __GNUC_MINOR >= 4) || __GNUC__ > 4
-	__attribute__ ((format (gnu_printf, 1, 2)))
+	__attribute__ ((format (gnu_printf, 2, 3)))
 #elif __GNUC__
-	__attribute__ ((format (printf, 1, 2)))
+	__attribute__ ((format (printf, 2, 3)))
 #endif
-void log_event(const char *format, ...);
+void log_event_ex(int add_nl, const char *format, ...);
 
 /*
  * Discards any buffered log data.

src/misc.c

@@ -32,6 +32,7 @@
 #include "logger.h"
 #include "params.h"
 #include "misc.h"
+#include "color.h"
 #include "options.h"
 
 #include "john_mpi.h"
@@ -49,17 +50,20 @@ void real_error(const char *file, int line)
 	exit(1);
 }
 
-void real_error_msg(const char *file, int line,  const char *format, ...)
+void real_error_msg(const char *file, int line, const char *format, ...)
 {
 	va_list args;
 
-#if defined(HAVE_MPI) && !defined(_JOHN_MISC_NO_LOG)
+#if !defined(_JOHN_MISC_NO_LOG)
+	fputs(color_error, stderr);
+#ifdef HAVE_MPI
 	if (mpi_p > 1)
 		fprintf(stderr, "%u@%s: ", mpi_id + 1, mpi_name);
 	else
-#elif OS_FORK && !defined(_JOHN_MISC_NO_LOG)
+#elif OS_FORK
 	if (options.fork)
 		fprintf(stderr, "%u: ", options.node_min);
+#endif
 #endif
 	va_start(args, format);
 	vfprintf(stderr, format, args);
@@ -73,6 +77,7 @@ void real_pexit(const char *file, int line, const char *format, ...)
 	va_list args;
 
 #if !defined(_JOHN_MISC_NO_LOG)
+	fputs(color_error, stderr);
 #if HAVE_MPI
 	if (mpi_p > 1)
 		fprintf(stderr, "%u@%s: ", mpi_id + 1, mpi_name);

src/misc.h

@@ -18,7 +18,10 @@
 #define _JOHN_MISC_H
 
 #include <stdio.h>
+
 #include "jumbo.h"
+#include "color.h"
+#include "logger.h"
 
 #if !AC_BUILT
  #include <string.h>
@@ -37,6 +40,31 @@
  #endif
 #endif
 
+/*
+ * Macro for warning/notice (stderr) only once per session.
+ */
+#define WARN_ONCE(color, ...)	  \
+	do { \
+		static int warned; \
+		if (!warned) { \
+			fprintf_color(color, __VA_ARGS__); \
+			warned++; \
+		} \
+	} while (0)
+
+/*
+ * Macro for warning/notice (stderr) AND logging, but only once per session.
+ */
+#define WARN_LOG_ONCE(color, stream, ...)	  \
+	do { \
+		static int warned; \
+		if (!warned) { \
+			fprintf_color(color, stream, __VA_ARGS__); \
+			log_event_ex(FALSE, __VA_ARGS__); \
+			warned++; \
+		} \
+	} while (0)
+
 /*
  * Exit on error. Logs the event, closes john.pot and the log file, and
  * terminates the process with non-zero exit status.