error: Actually check for strerror in configure and fix GNU-specific code.

[sysdb.git] / src / utils / error.c

diff --git a/src/utils/error.c b/src/utils/error.c
index fc360ebaa98b3f0741907e0d85fa79744f59add3..6d23c6bcf68b8e32661e7c49943ccb0c19d9b8b0 100644 (file)
--- a/src/utils/error.c
+++ b/src/utils/error.c
@@ -25,16 +25,21 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/error.h"
 #include "utils/strbuf.h"
 
 #include <pthread.h>
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
-
 #include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 
 /*
  * private data types
@@ -43,7 +48,7 @@
 typedef struct {
        int   prio;
        sdb_strbuf_t *msg;
-       _Bool logged;
+       bool logged;
 } sdb_error_ctx_t;
 #define SDB_ERROR_INIT { -1, NULL, 1 }
 
@@ -54,7 +59,9 @@ typedef struct {
 static sdb_error_ctx_t default_error_ctx = SDB_ERROR_INIT;
 
 static pthread_key_t error_ctx_key;
-static _Bool         error_ctx_key_initialized = 0;
+static bool          error_ctx_key_initialized = 0;
+
+static int (*logger)(int prio, const char *msg) = NULL;
 
 /*
  * private helper functions
@@ -162,9 +169,12 @@ sdb_do_log(int prio)
        if (ctx->logged)
                return 0;
 
-       ret = fprintf(stderr, "[%s] %s\n",
-                       SDB_LOG_PRIO_TO_STRING(prio),
-                       sdb_strbuf_string(ctx->msg));
+       if (logger)
+               ret = logger(prio, sdb_strbuf_string(ctx->msg));
+       else
+               ret = fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio),
+                               sdb_strbuf_string(ctx->msg));
+
        ctx->logged = 1;
        return ret;
 } /* sdb_do_log */
@@ -173,6 +183,12 @@ sdb_do_log(int prio)
  * public API
  */
 
+void
+sdb_error_set_logger(int (*f)(int, const char *))
+{
+       logger = f;
+} /* sdb_error_set_logger */
+
 int
 sdb_log(int prio, const char *fmt, ...)
 {
@@ -180,13 +196,19 @@ sdb_log(int prio, const char *fmt, ...)
        int ret;
 
        va_start(ap, fmt);
-       ret = sdb_error_vprintf(fmt, ap);
+       ret = sdb_vlog(prio, fmt, ap);
        va_end(ap);
+       return ret;
+} /* sdb_log */
 
+int
+sdb_vlog(int prio, const char *fmt, va_list ap)
+{
+       int ret = sdb_error_vprintf(fmt, ap);
        if (ret > 0)
                sdb_do_log(prio);
        return ret;
-} /* sdb_log */
+} /* sdb_vlog */
 
 int
 sdb_error_set(const char *fmt, ...)
@@ -214,6 +236,19 @@ sdb_error_append(const char *fmt, ...)
        return ret;
 } /* sdb_error_append */
 
+int
+sdb_error_chomp(void)
+{
+       sdb_error_ctx_t *ctx;
+
+       ctx = sdb_error_get_ctx();
+       if (! ctx)
+               return -1;
+
+       sdb_strbuf_chomp(ctx->msg);
+       return 0;
+} /* sdb_error_chomp */
+
 int
 sdb_error_log(int prio)
 {
@@ -242,13 +277,33 @@ sdb_error_get_prio(void)
        return ctx->prio;
 } /* sdb_error_get_prio */
 
+int
+sdb_error_parse_priority(char *prio)
+{
+       if (! strcasecmp(prio, "EMERG"))
+               return SDB_LOG_EMERG;
+       else if (! strcasecmp(prio, "ERROR"))
+               return SDB_LOG_ERR;
+       else if (! strcasecmp(prio, "WARNING"))
+               return SDB_LOG_WARNING;
+       else if (! strcasecmp(prio, "NOTICE"))
+               return SDB_LOG_NOTICE;
+       else if (! strcasecmp(prio, "INFO"))
+               return SDB_LOG_INFO;
+       else if (! strcasecmp(prio, "DEBUG"))
+               return SDB_LOG_DEBUG;
+       return -1;
+} /* sdb_error_parse_priority */
+
 char *
 sdb_strerror(int errnum, char *strerrbuf, size_t buflen)
 {
+       *strerrbuf = '\0';
+
 #if STRERROR_R_CHAR_P
        {
                char *tmp = strerror_r(errnum, strerrbuf, buflen);
-               if (*strerrbuf = '\0') {
+               if (*strerrbuf == '\0') {
                        if (tmp && (tmp != strerrbuf) && (*tmp != '\0'))
                                strncpy(strerrbuf, tmp, buflen);
                        else