output: added slbt_output_error_record(), slbt_output_error_vector().

3 files changed, 160 insertions, 0 deletions

diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h
index 804ced5..eeeb090 100644
--- a/include/slibtool/slibtool.h
+++ b/include/slibtool/slibtool.h
@@ -282,6 +282,8 @@ slbt_api int  slbt_output_compile	(const struct slbt_driver_ctx *, const struct
 slbt_api int  slbt_output_execute	(const struct slbt_driver_ctx *, const struct slbt_exec_ctx *);
 slbt_api int  slbt_output_install	(const struct slbt_driver_ctx *, const struct slbt_exec_ctx *);
 slbt_api int  slbt_output_link		(const struct slbt_driver_ctx *, const struct slbt_exec_ctx *);
+slbt_api int  slbt_output_error_record	(const struct slbt_driver_ctx *, const struct slbt_error_info *);
+slbt_api int  slbt_output_error_vector	(const struct slbt_driver_ctx *);
 
 #ifdef __cplusplus
 }
diff --git a/project/common.mk b/project/common.mk
index 6573439..56121f2 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -16,6 +16,7 @@ COMMON_SRCS = \
 	src/logic/slbt_exec_link.c \
 	src/logic/slbt_map_input.c \
 	src/output/slbt_output_config.c \
+	src/output/slbt_output_error.c \
 	src/output/slbt_output_exec.c \
 	src/skin/slbt_skin_default.c \
 	src/skin/slbt_skin_install.c \
diff --git a/src/output/slbt_output_error.c b/src/output/slbt_output_error.c
new file mode 100644
index 0000000..478838f
--- /dev/null
+++ b/src/output/slbt_output_error.c
@@ -0,0 +1,157 @@
+/*******************************************************************/
+/*  slibtool: a skinny libtool implementation, written in C        */
+/*  Copyright (C) 2016  Z. Gilboa                                  */
+/*  Released under the Standard MIT License; see COPYING.SLIBTOOL. */
+/*******************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <slibtool/slibtool.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 * slbt_output_error_header(const struct slbt_error_info * erri)
+{
+	if (erri->flags & SLBT_ERROR_CHILD)
+		return "exec error upon";
+
+	else if (erri->flags & SLBT_ERROR_TOP_LEVEL)
+		return "error logged in";
+
+	else if (erri->flags & SLBT_ERROR_NESTED)
+		return "< returned to >";
+
+	else
+		return "distorted state";
+}
+
+static const char * slbt_output_strerror(const struct slbt_error_info * erri)
+{
+	if (erri->flags & SLBT_ERROR_CUSTOM)
+		return "flow error: unexpected condition or other.";
+
+	else if (erri->flags & SLBT_ERROR_NESTED)
+		return "";
+
+	else if (erri->flags & SLBT_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 slbt_output_error_record_plain(
+	const struct slbt_driver_ctx *	dctx,
+	const struct slbt_error_info *	erri)
+{
+	const char * errdesc = slbt_output_strerror(erri);
+
+	if (fprintf(stderr,"%s: %s %s(), line %d%s%s.\n",
+			dctx->program,
+			slbt_output_error_header(erri),
+			erri->function,
+			erri->line,
+			strlen(errdesc) ? ": " : "",
+			errdesc) < 0)
+		return -1;
+
+	return fflush(stderr);
+}
+
+static int slbt_output_error_record_annotated(
+	const struct slbt_driver_ctx *	dctx,
+	const struct slbt_error_info *	erri)
+{
+	const char * errdesc = slbt_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,
+			slbt_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,
+			slbt_output_strerror(erri),
+			aclr_reset) < 0)
+		return -1;
+
+	return fflush(stderr);
+}
+
+int slbt_output_error_record(
+	const struct slbt_driver_ctx *	dctx,
+	const struct slbt_error_info *	erri)
+{
+	if (dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER)
+		return slbt_output_error_record_plain(dctx,erri);
+
+	else if (dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_ALWAYS)
+		return slbt_output_error_record_annotated(dctx,erri);
+
+	else if (isatty(STDERR_FILENO))
+		return slbt_output_error_record_annotated(dctx,erri);
+
+	else
+		return slbt_output_error_record_plain(dctx,erri);
+}
+
+static int slbt_output_error_vector_plain(const struct slbt_driver_ctx * dctx)
+{
+	struct slbt_error_info ** perr;
+
+	for (perr=dctx->errv; *perr; perr++)
+		if (slbt_output_error_record_plain(dctx,*perr))
+			return -1;
+
+	return 0;
+}
+
+static int slbt_output_error_vector_annotated(const struct slbt_driver_ctx * dctx)
+{
+	struct slbt_error_info ** perr;
+
+	for (perr=dctx->errv; *perr; perr++)
+		if (slbt_output_error_record_annotated(dctx,*perr))
+			return -1;
+
+	return 0;
+}
+
+int slbt_output_error_vector(const struct slbt_driver_ctx * dctx)
+{
+	if (dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER)
+		return slbt_output_error_vector_plain(dctx);
+
+	else if (dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_ALWAYS)
+		return slbt_output_error_vector_annotated(dctx);
+
+	else if (isatty(STDERR_FILENO))
+		return slbt_output_error_vector_annotated(dctx);
+
+	else
+		return slbt_output_error_vector_plain(dctx);
+}