Move warn/error into common and make static builds work.

common/error.c

@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2004-2005, 2010-2012 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# include "compat/stdbool.h"
+#endif /* HAVE_STDBOOL_H */
+
+#include "missing.h"
+#include "alloc.h"
+#include "error.h"
+#include "sudo_plugin.h"
+
+#define DEFAULT_TEXT_DOMAIN	"sudo"
+#include "gettext.h"
+
+static sigjmp_buf error_jmp;
+static bool setjmp_enabled = false;
+static struct sudo_error_callback {
+    void (*func)(void);
+    struct sudo_error_callback *next;
+} *callbacks;
+
+static void _warning(int, const char *, va_list);
+
+static void
+do_cleanup(void)
+{
+    struct sudo_error_callback *cb;
+
+    /* Run callbacks, removing them from the list as we go. */
+    while ((cb = callbacks) != NULL) {
+	callbacks = cb->next;
+	cb->func();
+	free(cb);
+    }
+}
+
+void
+error2(int eval, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    _warning(1, fmt, ap);
+    va_end(ap);
+    do_cleanup();
+    if (setjmp_enabled)
+	siglongjmp(error_jmp, eval);
+    else
+	exit(eval);
+}
+
+void
+errorx2(int eval, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    _warning(0, fmt, ap);
+    va_end(ap);
+    do_cleanup();
+    if (setjmp_enabled)
+	siglongjmp(error_jmp, eval);
+    else
+	exit(eval);
+}
+
+void
+verror2(int eval, const char *fmt, va_list ap)
+{
+    _warning(1, fmt, ap);
+    do_cleanup();
+    if (setjmp_enabled)
+	siglongjmp(error_jmp, eval);
+    else
+	exit(eval);
+}
+
+void
+verrorx2(int eval, const char *fmt, va_list ap)
+{
+    _warning(0, fmt, ap);
+    do_cleanup();
+    if (setjmp_enabled)
+	siglongjmp(error_jmp, eval);
+    else
+	exit(eval);
+}
+
+void
+warning2(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    _warning(1, fmt, ap);
+    va_end(ap);
+}
+
+void
+warningx2(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    _warning(0, fmt, ap);
+    va_end(ap);
+}
+
+void
+vwarning2(const char *fmt, va_list ap)
+{
+    _warning(1, fmt, ap);
+}
+
+void
+vwarningx2(const char *fmt, va_list ap)
+{
+    _warning(0, fmt, ap);
+}
+
+static void
+_warning(int use_errno, const char *fmt, va_list ap)
+{
+    int serrno = errno;
+    char *str;
+
+    evasprintf(&str, fmt, ap);
+    if (use_errno) {
+	if (fmt != NULL) {
+	    sudo_printf(SUDO_CONV_ERROR_MSG,
+		_("%s: %s: %s\n"), getprogname(), str, strerror(serrno));
+	} else {
+	    sudo_printf(SUDO_CONV_ERROR_MSG,
+		_("%s: %s\n"), getprogname(), strerror(serrno));
+	}
+    } else {
+	sudo_printf(SUDO_CONV_ERROR_MSG,
+	    _("%s: %s\n"), getprogname(), str ? str : "(null)");
+    }
+    efree(str);
+    errno = serrno;
+}
+
+int
+error_callback_register(void (*func)(void))
+{
+    struct sudo_error_callback *cb;
+
+    cb = malloc(sizeof(*cb));
+    if (cb == NULL)
+	return -1;
+    cb->func = func;
+    cb->next = callbacks;
+    callbacks = cb;
+
+    return 0;
+}
+
+int
+plugin_setjmp(void)
+{
+    setjmp_enabled = true;
+    return sigsetjmp(error_jmp, 1);
+}
+
+void
+plugin_longjmp(int val)
+{
+    siglongjmp(error_jmp, val);
+}
+
+void
+plugin_clearjmp(void)
+{
+    setjmp_enabled = false;
+}