output: added pe_output_error_record(), pe_output_error_vector().

3 files changed, 165 insertions, 0 deletions

diff --git a/include/perk/perk.h b/include/perk/perk.h
index 5951fa6..6f0ee27 100644
--- a/include/perk/perk.h
+++ b/include/perk/perk.h
@@ -39,6 +39,10 @@ extern "C" {
 #define PERK_DRIVER_VERSION		0x0010
 #define PERK_DRIVER_DRY_RUN		0x0020
 
+#define PERK_DRIVER_ANNOTATE_ALWAYS	0x1000
+#define PERK_DRIVER_ANNOTATE_NEVER	0x2000
+#define PERK_DRIVER_ANNOTATE_FULL	0x4000
+
 /* unit action flags */
 #define PERK_ACTION_MAP_READWRITE	0x0001
 
@@ -197,6 +201,8 @@ perk_api void pe_free_unit_ctx		(struct pe_unit_ctx *);
 perk_api int  pe_main			(int, char **, char **);
 perk_api int  pe_output_export_symbols	(const struct pe_image_meta *, const struct pe_common_ctx *, FILE *);
 perk_api int  pe_output_import_libraries(const struct pe_image_meta *, const struct pe_common_ctx *, FILE *);
+perk_api int  pe_output_error_record	(const struct pe_driver_ctx *, const struct pe_error_info *);
+perk_api int  pe_output_error_vector	(const struct pe_driver_ctx *);
 
 /* high-level api */
 perk_api int  pe_map_raw_image		(const struct pe_driver_ctx *, int fd, const char * path, int prot, struct pe_raw_image *);
diff --git a/project/common.mk b/project/common.mk
index 3857c62..74b307f 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -5,6 +5,7 @@ COMMON_SRCS = \
 	src/internal/perk_errinfo_impl.c \
 	src/logic/pe_get_image_meta.c \
 	src/logic/pe_map_raw_image.c \
+	src/output/pe_output_error.c \
 	src/output/pe_output_export_symbols.c \
 	src/output/pe_output_import_libraries.c \
 	src/reader/pe_read_coff_header.c \
diff --git a/src/output/pe_output_error.c b/src/output/pe_output_error.c
new file mode 100644
index 0000000..21843b0
--- /dev/null
+++ b/src/output/pe_output_error.c
@@ -0,0 +1,158 @@
+/***************************************************************/
+/*  perk: PE Resource Kit                                      */
+/*  Copyright (C) 2015--2016  Z. Gilboa                        */
+/*  Released under GPLv2 and GPLv3; see COPYING.PERK.          */
+/***************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <perk/perk.h>
+
+static const char aclr_reset[]   = "\x1b[0m";
+static const char aclr_bold[]    = "\x1b[1m";
+
+static const char aclr_green[]   = "\x1b[32m";
+static const char aclr_blue[]    = "\x1b[34m";
+static const char aclr_magenta[] = "\x1b[35m";
+
+static const char * pe_output_error_header(const struct pe_error_info * erri)
+{
+	if (erri->flags & PERK_ERROR_CHILD)
+		return "exec error upon";
+
+	else if (erri->flags & PERK_ERROR_TOP_LEVEL)
+		return "error logged in";
+
+	else if (erri->flags & PERK_ERROR_NESTED)
+		return "< returned to >";
+
+	else
+		return "distorted state";
+}
+
+static const char * pe_output_strerror(const struct pe_error_info * erri)
+{
+	if (erri->flags & PERK_ERROR_CUSTOM)
+		return "flow error: unexpected condition or other";
+
+	else if (erri->flags & PERK_ERROR_NESTED)
+		return "";
+
+	else if (erri->flags & PERK_ERROR_CHILD)
+		return "(see child process error messages)";
+
+	else if (erri->syserror == ENOBUFS)
+		return "input error: string length exceeds buffer size.";
+
+	else
+		return strerror(erri->syserror);
+}
+
+static int pe_output_error_record_plain(
+	const struct pe_driver_ctx *	dctx,
+	const struct pe_error_info *	erri)
+{
+	const char * errdesc = pe_output_strerror(erri);
+
+	if (fprintf(stderr,"%s: %s %s(), line %d%s%s.\n",
+			dctx->program,
+			pe_output_error_header(erri),
+			erri->function,
+			erri->line,
+			strlen(errdesc) ? ": " : "",
+			errdesc) < 0)
+		return -1;
+
+	return fflush(stderr);
+}
+
+static int pe_output_error_record_annotated(
+	const struct pe_driver_ctx *	dctx,
+	const struct pe_error_info *	erri)
+{
+	const char * errdesc = pe_output_strerror(erri);
+
+	if (fprintf(
+			stderr,
+			"%s%s%s:%s %s%s%s %s%s%s()%s, %s%sline %d%s%s%s%s%s.\n",
+
+			aclr_bold,aclr_magenta,
+			dctx->program,
+			aclr_reset,
+
+			aclr_bold,
+			pe_output_error_header(erri),
+			aclr_reset,
+
+			aclr_bold,aclr_blue,
+			erri->function,
+			aclr_reset,
+
+			aclr_bold,aclr_green,
+			erri->line,
+			aclr_reset,
+			strlen(errdesc) ? ": " : "",
+
+			aclr_bold,
+			pe_output_strerror(erri),
+			aclr_reset) < 0)
+		return -1;
+
+	return fflush(stderr);
+}
+
+int pe_output_error_record(
+	const struct pe_driver_ctx *	dctx,
+	const struct pe_error_info *	erri)
+{
+	if (dctx->cctx->drvflags & PERK_DRIVER_ANNOTATE_NEVER)
+		return pe_output_error_record_plain(dctx,erri);
+
+	else if (dctx->cctx->drvflags & PERK_DRIVER_ANNOTATE_ALWAYS)
+		return pe_output_error_record_annotated(dctx,erri);
+
+	else if (isatty(STDERR_FILENO))
+		return pe_output_error_record_annotated(dctx,erri);
+
+	else
+		return pe_output_error_record_plain(dctx,erri);
+}
+
+static int pe_output_error_vector_plain(const struct pe_driver_ctx * dctx)
+{
+	struct pe_error_info ** perr;
+
+	for (perr=dctx->errv; *perr; perr++)
+		if (pe_output_error_record_plain(dctx,*perr))
+			return -1;
+
+	return 0;
+}
+
+static int pe_output_error_vector_annotated(const struct pe_driver_ctx * dctx)
+{
+	struct pe_error_info ** perr;
+
+	for (perr=dctx->errv; *perr; perr++)
+		if (pe_output_error_record_annotated(dctx,*perr))
+			return -1;
+
+	return 0;
+}
+
+int pe_output_error_vector(const struct pe_driver_ctx * dctx)
+{
+	if (dctx->cctx->drvflags & PERK_DRIVER_ANNOTATE_NEVER)
+		return pe_output_error_vector_plain(dctx);
+
+	else if (dctx->cctx->drvflags & PERK_DRIVER_ANNOTATE_ALWAYS)
+		return pe_output_error_vector_annotated(dctx);
+
+	else if (isatty(STDERR_FILENO))
+		return pe_output_error_vector_annotated(dctx);
+
+	else
+		return pe_output_error_vector_plain(dctx);
+}