No OneTemporary
Actions

Size

49 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/common/output_html.c b/lib/common/output_html.c
	index c8f008813d..fc06641618 100644
	--- a/lib/common/output_html.c
	+++ b/lib/common/output_html.c
	@@ -1,427 +1,428 @@
	/*
	* Copyright 2019-2020 the Pacemaker project contributors
	*
	* The version control history for this file may have further details.
	*
	* This source code is licensed under the GNU Lesser General Public License
	* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
	*/

	#ifndef _GNU_SOURCE
	# define _GNU_SOURCE
	#endif

	#include <ctype.h>
	#include <libxml/HTMLtree.h>
	#include <stdarg.h>
	#include <stdlib.h>
	#include <stdio.h>
	#include <crm/crm.h>
	#include <crm/common/output.h>
	#include <crm/common/xml.h>

	static const char *stylesheet_default =
	".bold { font-weight: bold }\n"
	".maint { color: blue }\n"
	".offline { color: red }\n"
	".online { color: green }\n"
	".rsc-failed { color: red }\n"
	".rsc-failure-ignored { color: yellow }\n"
	".rsc-managed { color: yellow }\n"
	".rsc-multiple { color: orange }\n"
	".rsc-ok { color: green }\n"
	".standby { color: orange }\n"
	".warning { color: red, font-weight: bold }";

	static gboolean cgi_output = FALSE;
	static char *stylesheet_link = NULL;
	static char *title = NULL;
	static GSList *extra_headers = NULL;

	GOptionEntry pcmk__html_output_entries[] = {
	{ "html-cgi", 0, 0, G_OPTION_ARG_NONE, &cgi_output,
	"Add CGI headers (requires --output-as=html)",
	NULL },

	{ "html-stylesheet", 0, 0, G_OPTION_ARG_STRING, &stylesheet_link,
	"Link to an external stylesheet (requires --output-as=html)",
	"URI" },

	{ "html-title", 0, 0, G_OPTION_ARG_STRING, &title,
	"Specify a page title (requires --output-as=html)",
	"TITLE" },

	{ NULL }
	};

	typedef struct private_data_s {
	xmlNode *root;
	GQueue *parent_q;
	GSList *errors;
	} private_data_t;

	static void
	html_free_priv(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	if (priv == NULL) {
	return;
	}

	xmlFreeNode(priv->root);
	g_queue_free(priv->parent_q);
	g_slist_free(priv->errors);
	free(priv);
	+ out->priv = NULL;
	}

	static bool
	html_init(pcmk__output_t *out) {
	private_data_t *priv = NULL;

	/* If html_init was previously called on this output struct, just return. */
	if (out->priv != NULL) {
	return true;
	} else {
	out->priv = calloc(1, sizeof(private_data_t));
	if (out->priv == NULL) {
	return false;
	}

	priv = out->priv;
	}

	priv->parent_q = g_queue_new();

	priv->root = create_xml_node(NULL, "html");
	xmlCreateIntSubset(priv->root->doc, (pcmkXmlStr) "html", NULL, NULL);

	xmlSetProp(priv->root, (pcmkXmlStr) "lang", (pcmkXmlStr) "en");
	g_queue_push_tail(priv->parent_q, priv->root);
	priv->errors = NULL;

	pcmk__output_xml_create_parent(out, "body");

	return true;
	}

	static void
	add_error_node(gpointer data, gpointer user_data) {
	char str = (char ) data;
	pcmk__output_t out = (pcmk__output_t ) user_data;
	out->list_item(out, NULL, "%s", str);
	}

	static void
	html_finish(pcmk__output_t out, crm_exit_t exit_status, bool print, void *copy_dest) {
	private_data_t *priv = out->priv;
	htmlNodePtr head_node = NULL;
	htmlNodePtr charset_node = NULL;

	/* If root is NULL, html_init failed and we are being called from pcmk__output_free
	* in the pcmk__output_new path.
	*/
	if (priv == NULL \|\| priv->root == NULL) {
	return;
	}

	if (cgi_output && print) {
	fprintf(out->dest, "Content-Type: text/html\n\n");
	}

	/* Add the head node last - it's not needed earlier because it doesn't contain
	* anything else that the user could add, and we want it done last to pick up
	* any options that may have been given.
	*/
	head_node = xmlNewNode(NULL, (pcmkXmlStr) "head");

	if (title != NULL ) {
	pcmk_create_xml_text_node(head_node, "title", title);
	} else if (out->request != NULL) {
	pcmk_create_xml_text_node(head_node, "title", out->request);
	}

	charset_node = create_xml_node(head_node, "meta");
	xmlSetProp(charset_node, (pcmkXmlStr) "charset", (pcmkXmlStr) "utf-8");

	/* Add any extra header nodes the caller might have created. */
	for (int i = 0; i < g_slist_length(extra_headers); i++) {
	xmlAddChild(head_node, g_slist_nth_data(extra_headers, i));
	}

	/* Stylesheets are included two different ways. The first is via a built-in
	* default (see the stylesheet_default const above). The second is via the
	* html-stylesheet option, and this should obviously be a link to a
	* stylesheet. The second can override the first. At least one should be
	* given.
	*/
	pcmk_create_xml_text_node(head_node, "style", stylesheet_default);

	if (stylesheet_link != NULL) {
	htmlNodePtr link_node = create_xml_node(head_node, "link");
	xmlSetProp(link_node, (pcmkXmlStr) "rel", (pcmkXmlStr) "stylesheet");
	xmlSetProp(link_node, (pcmkXmlStr) "href", (pcmkXmlStr) stylesheet_link);
	}

	xmlAddPrevSibling(priv->root->children, head_node);

	if (g_slist_length(priv->errors) > 0) {
	out->begin_list(out, "Errors", NULL, NULL);
	g_slist_foreach(priv->errors, add_error_node, (gpointer) out);
	out->end_list(out);
	}

	if (print) {
	htmlDocDump(out->dest, priv->root->doc);
	}

	if (copy_dest != NULL) {
	*copy_dest = copy_xml(priv->root);
	}
	}

	static void
	html_reset(pcmk__output_t *out) {
	CRM_ASSERT(out != NULL);

	if (out->priv != NULL) {
	private_data_t *priv = out->priv;
	htmlDocDump(out->dest, priv->root->doc);
	}

	html_free_priv(out);
	g_slist_free_full(extra_headers, (GDestroyNotify) xmlFreeNode);
	html_init(out);
	}

	static void
	html_subprocess_output(pcmk__output_t *out, int exit_status,
	const char proc_stdout, const char proc_stderr) {
	char *rc_buf = NULL;
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);

	rc_buf = crm_strdup_printf("Return code: %d", exit_status);

	pcmk__output_create_xml_text_node(out, "h2", "Command Output");
	pcmk__output_create_html_node(out, "div", NULL, NULL, rc_buf);

	if (proc_stdout != NULL) {
	pcmk__output_create_html_node(out, "div", NULL, NULL, "Stdout");
	pcmk__output_create_html_node(out, "div", NULL, "output", proc_stdout);
	}
	if (proc_stderr != NULL) {
	pcmk__output_create_html_node(out, "div", NULL, NULL, "Stderr");
	pcmk__output_create_html_node(out, "div", NULL, "output", proc_stderr);
	}

	free(rc_buf);
	}

	static void
	html_version(pcmk__output_t *out, bool extended) {
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);

	pcmk__output_create_xml_text_node(out, "h2", "Version Information");
	pcmk__output_create_html_node(out, "div", NULL, NULL, "Program: Pacemaker");
	pcmk__output_create_html_node(out, "div", NULL, NULL, crm_strdup_printf("Version: %s", PACEMAKER_VERSION));
	pcmk__output_create_html_node(out, "div", NULL, NULL, "Author: Andrew Beekhof");
	pcmk__output_create_html_node(out, "div", NULL, NULL, crm_strdup_printf("Build: %s", BUILD_VERSION));
	pcmk__output_create_html_node(out, "div", NULL, NULL, crm_strdup_printf("Features: %s", CRM_FEATURES));
	}

	G_GNUC_PRINTF(2, 3)
	static void
	html_err(pcmk__output_t out, const char format, ...) {
	private_data_t *priv = out->priv;
	int len = 0;
	char *buf = NULL;
	va_list ap;

	CRM_ASSERT(priv != NULL);
	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	priv->errors = g_slist_append(priv->errors, buf);
	}

	G_GNUC_PRINTF(2, 3)
	static void
	html_info(pcmk__output_t out, const char format, ...) {
	/* This function intentially left blank */
	}

	static void
	html_output_xml(pcmk__output_t out, const char name, const char *buf) {
	htmlNodePtr node = NULL;
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	node = pcmk__output_create_html_node(out, "pre", NULL, NULL, buf);
	xmlSetProp(node, (pcmkXmlStr) "lang", (pcmkXmlStr) "xml");
	}

	G_GNUC_PRINTF(4, 5)
	static void
	html_begin_list(pcmk__output_t out, const char singular_noun,
	const char plural_noun, const char format, ...) {
	int q_len = 0;
	private_data_t *priv = out->priv;
	xmlNodePtr node = NULL;

	CRM_ASSERT(priv != NULL);

	/* If we are already in a list (the queue depth is always at least
	* one because of the <html> element), first create a <li> element
	* to hold the <h2> and the new list.
	*/
	q_len = g_queue_get_length(priv->parent_q);
	if (q_len > 2) {
	pcmk__output_xml_create_parent(out, "li");
	}

	if (format != NULL) {
	va_list ap;
	char *buf = NULL;
	int len;

	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	va_end(ap);
	CRM_ASSERT(len >= 0);

	if (q_len > 2) {
	pcmk__output_create_xml_text_node(out, "h3", buf);
	} else {
	pcmk__output_create_xml_text_node(out, "h2", buf);
	}

	free(buf);
	}

	node = pcmk__output_xml_create_parent(out, "ul");
	g_queue_push_tail(priv->parent_q, node);
	}

	G_GNUC_PRINTF(3, 4)
	static void
	html_list_item(pcmk__output_t out, const char name, const char *format, ...) {
	private_data_t *priv = out->priv;
	htmlNodePtr item_node = NULL;
	va_list ap;
	char *buf = NULL;
	int len;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	item_node = pcmk__output_create_xml_text_node(out, "li", buf);
	free(buf);

	if (name != NULL) {
	xmlSetProp(item_node, (pcmkXmlStr) "class", (pcmkXmlStr) name);
	}
	}

	static void
	html_increment_list(pcmk__output_t *out) {
	/* This function intentially left blank */
	}

	static void
	html_end_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	/* Remove the <ul> tag. */
	g_queue_pop_tail(priv->parent_q);
	pcmk__output_xml_pop_parent(out);

	/* Remove the <li> created for nested lists. */
	if (g_queue_get_length(priv->parent_q) > 2) {
	pcmk__output_xml_pop_parent(out);
	}
	}

	pcmk__output_t *
	pcmk__mk_html_output(char **argv) {
	pcmk__output_t *retval = calloc(1, sizeof(pcmk__output_t));

	if (retval == NULL) {
	return NULL;
	}

	retval->fmt_name = "html";
	retval->request = argv == NULL ? NULL : g_strjoinv(" ", argv);
	retval->supports_quiet = false;

	retval->init = html_init;
	retval->free_priv = html_free_priv;
	retval->finish = html_finish;
	retval->reset = html_reset;

	retval->register_message = pcmk__register_message;
	retval->message = pcmk__call_message;

	retval->subprocess_output = html_subprocess_output;
	retval->version = html_version;
	retval->info = html_info;
	retval->err = html_err;
	retval->output_xml = html_output_xml;

	retval->begin_list = html_begin_list;
	retval->list_item = html_list_item;
	retval->increment_list = html_increment_list;
	retval->end_list = html_end_list;

	return retval;
	}

	xmlNodePtr
	pcmk__output_create_html_node(pcmk__output_t out, const char element_name, const char *id,
	const char class_name, const char text) {
	htmlNodePtr node = pcmk__output_create_xml_text_node(out, element_name, text);

	if (class_name != NULL) {
	xmlSetProp(node, (pcmkXmlStr) "class", (pcmkXmlStr) class_name);
	}

	if (id != NULL) {
	xmlSetProp(node, (pcmkXmlStr) "id", (pcmkXmlStr) id);
	}

	return node;
	}

	void
	pcmk__html_add_header(xmlNodePtr parent, const char *name, ...) {
	htmlNodePtr header_node;
	va_list ap;

	va_start(ap, name);

	header_node = xmlNewNode(NULL, (pcmkXmlStr) name);
	while (1) {
	char key = va_arg(ap, char );
	char *value;

	if (key == NULL) {
	break;
	}

	value = va_arg(ap, char *);
	xmlSetProp(header_node, (pcmkXmlStr) key, (pcmkXmlStr) value);
	}

	extra_headers = g_slist_append(extra_headers, header_node);

	va_end(ap);
	}
	diff --git a/lib/common/output_log.c b/lib/common/output_log.c
	index 5b45ce4a9f..020804658c 100644
	--- a/lib/common/output_log.c
	+++ b/lib/common/output_log.c
	@@ -1,250 +1,251 @@
	/*
	* Copyright 2019 the Pacemaker project contributors
	*
	* The version control history for this file may have further details.
	*
	* This source code is licensed under the GNU Lesser General Public License
	* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
	*/
	#ifndef _GNU_SOURCE
	# define _GNU_SOURCE
	#endif

	#include <ctype.h>
	#include <libxml/HTMLtree.h>
	#include <stdarg.h>
	#include <stdlib.h>
	#include <stdio.h>
	#include <crm/crm.h>
	#include <crm/common/output.h>
	#include <crm/common/xml.h>

	GOptionEntry pcmk__log_output_entries[] = {
	{ NULL }
	};

	typedef struct private_data_s {
	/* gathered in log_begin_list */
	GQueue/<char>/ prefixes;
	} private_data_t;

	static void
	log_subprocess_output(pcmk__output_t *out, int exit_status,
	const char proc_stdout, const char proc_stderr) {
	/* This function intentionally left blank */
	}

	static void
	log_free_priv(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	if (priv == NULL) {
	return;
	}

	g_queue_free(priv->prefixes);
	free(priv);
	+ out->priv = NULL;
	}

	static bool
	log_init(pcmk__output_t *out) {

	/* If log_init was previously called on this output struct, just return. */
	if (out->priv != NULL) {
	return true;
	}

	out->priv = calloc(1, sizeof(private_data_t));
	if (out->priv == NULL) {
	return false;
	}
	((private_data_t *)out->priv)->prefixes = g_queue_new();
	return true;
	}

	static void
	log_finish(pcmk__output_t out, crm_exit_t exit_status, bool print, void *copy_dest) {
	/* This function intentionally left blank */
	}

	static void
	log_reset(pcmk__output_t *out) {
	CRM_ASSERT(out != NULL);

	log_free_priv(out);
	log_init(out);
	}

	static void
	log_version(pcmk__output_t *out, bool extended) {
	if (extended) {
	crm_info("Pacemaker %s (Build: %s): %s",
	PACEMAKER_VERSION, BUILD_VERSION, CRM_FEATURES);
	} else {
	crm_info("Pacemaker %s", PACEMAKER_VERSION);
	crm_info("Written by Andrew Beekhof");
	}
	}

	G_GNUC_PRINTF(2, 3)
	static void
	log_err(pcmk__output_t out, const char format, ...) {
	va_list ap;
	char* buffer = NULL;
	int len = 0;

	va_start(ap, format);
	/* Informational output does not get indented, to separate it from other
	* potentially indented list output.
	*/
	len = vasprintf(&buffer, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	crm_err("%s", buffer);

	free(buffer);
	}

	static void
	log_output_xml(pcmk__output_t out, const char name, const char *buf) {
	xmlNodePtr node = NULL;
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);

	node = create_xml_node(NULL, name);
	xmlNodeSetContent(node, (pcmkXmlStr) buf);
	crm_log_xml_info(node, name);
	free(node);
	}

	G_GNUC_PRINTF(4, 5)
	static void
	log_begin_list(pcmk__output_t out, const char singular_noun, const char *plural_noun,
	const char *format, ...) {
	int len = 0;
	va_list ap;
	char* buffer = NULL;
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);

	va_start(ap, format);
	len = vasprintf(&buffer, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	/* Don't skip empty prefixes,
	* otherwise there will be mismatch
	* in the log_end_list */
	if(strcmp(buffer, "") == 0) {
	/* nothing */
	}

	g_queue_push_tail(priv->prefixes, buffer);
	}

	G_GNUC_PRINTF(3, 4)
	static void
	log_list_item(pcmk__output_t out, const char name, const char *format, ...) {
	int len = 0;
	va_list ap;
	private_data_t *priv = out->priv;
	char prefix[LINE_MAX] = { 0 };
	int offset = 0;
	char* buffer = NULL;

	CRM_ASSERT(priv != NULL);

	for (GList* gIter = priv->prefixes->head; gIter; gIter = gIter->next) {
	if (strcmp(prefix, "") != 0) {
	offset += snprintf(prefix + offset, LINE_MAX - offset, ": %s", (char *)gIter->data);
	} else {
	offset = snprintf(prefix, LINE_MAX, "%s", (char *)gIter->data);
	}
	}

	va_start(ap, format);
	len = vasprintf(&buffer, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	if (strcmp(buffer, "") != 0) { /* We don't want empty messages */
	if ((name != NULL) && (strcmp(name, "") != 0)) {
	if (strcmp(prefix, "") != 0) {
	crm_info("%s: %s: %s", prefix, name, buffer);
	} else {
	crm_info("%s: %s", name, buffer);
	}
	} else {
	if (strcmp(prefix, "") != 0) {
	crm_info("%s: %s", prefix, buffer);
	} else {
	crm_info("%s", buffer);
	}
	}
	}
	free(buffer);
	}

	static void
	log_end_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);
	if (priv->prefixes == NULL) {
	return;
	}
	CRM_ASSERT(priv->prefixes->tail != NULL);

	free((char *)priv->prefixes->tail->data);
	g_queue_pop_tail(priv->prefixes);
	}

	G_GNUC_PRINTF(2, 3)
	static void
	log_info(pcmk__output_t out, const char format, ...) {
	int len = 0;
	va_list ap;
	char* buffer = NULL;

	va_start(ap, format);
	len = vasprintf(&buffer, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	crm_info("%s", buffer);

	free(buffer);
	}

	pcmk__output_t *
	pcmk__mk_log_output(char **argv) {
	pcmk__output_t *retval = calloc(1, sizeof(pcmk__output_t));

	if (retval == NULL) {
	return NULL;
	}

	retval->fmt_name = "log";
	retval->request = argv == NULL ? NULL : g_strjoinv(" ", argv);
	retval->supports_quiet = false;

	retval->init = log_init;
	retval->free_priv = log_free_priv;
	retval->finish = log_finish;
	retval->reset = log_reset;

	retval->register_message = pcmk__register_message;
	retval->message = pcmk__call_message;

	retval->subprocess_output = log_subprocess_output;
	retval->version = log_version;
	retval->info = log_info;
	retval->err = log_err;
	retval->output_xml = log_output_xml;

	retval->begin_list = log_begin_list;
	retval->list_item = log_list_item;
	retval->end_list = log_end_list;

	return retval;
	}
	diff --git a/lib/common/output_text.c b/lib/common/output_text.c
	index 54c409a705..8f15849803 100644
	--- a/lib/common/output_text.c
	+++ b/lib/common/output_text.c
	@@ -1,305 +1,306 @@
	/*
	* Copyright 2019 the Pacemaker project contributors
	*
	* The version control history for this file may have further details.
	*
	* This source code is licensed under the GNU Lesser General Public License
	* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
	*/

	#include <stdarg.h>
	#include <stdlib.h>
	#include <crm/crm.h>
	#include <crm/common/output.h>
	#include <glib.h>

	static gboolean fancy = FALSE;

	GOptionEntry pcmk__text_output_entries[] = {
	{ "text-fancy", 0, 0, G_OPTION_ARG_NONE, &fancy,
	"Use more highly formatted output (requires --output-as=text)",
	NULL },

	{ NULL }
	};

	typedef struct text_list_data_s {
	unsigned int len;
	char *singular_noun;
	char *plural_noun;
	} text_list_data_t;

	typedef struct private_data_s {
	GQueue *parent_q;
	} private_data_t;

	static void
	text_free_priv(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	if (priv == NULL) {
	return;
	}

	g_queue_free(priv->parent_q);
	free(priv);
	+ out->priv = NULL;
	}

	static bool
	text_init(pcmk__output_t *out) {
	private_data_t *priv = NULL;

	/* If text_init was previously called on this output struct, just return. */
	if (out->priv != NULL) {
	return true;
	} else {
	out->priv = calloc(1, sizeof(private_data_t));
	if (out->priv == NULL) {
	return false;
	}

	priv = out->priv;
	}

	priv->parent_q = g_queue_new();
	return true;
	}

	static void
	text_finish(pcmk__output_t out, crm_exit_t exit_status, bool print, void *copy_dest) {
	/* This function intentionally left blank */
	}

	static void
	text_reset(pcmk__output_t *out) {
	CRM_ASSERT(out != NULL);

	text_free_priv(out);
	text_init(out);
	}

	static void
	text_subprocess_output(pcmk__output_t *out, int exit_status,
	const char proc_stdout, const char proc_stderr) {
	if (proc_stdout != NULL) {
	fprintf(out->dest, "%s\n", proc_stdout);
	}

	if (proc_stderr != NULL) {
	fprintf(out->dest, "%s\n", proc_stderr);
	}
	}

	static void
	text_version(pcmk__output_t *out, bool extended) {
	if (extended) {
	fprintf(out->dest, "Pacemaker %s (Build: %s): %s\n", PACEMAKER_VERSION, BUILD_VERSION, CRM_FEATURES);
	} else {
	fprintf(out->dest, "Pacemaker %s\n", PACEMAKER_VERSION);
	fprintf(out->dest, "Written by Andrew Beekhof\n");
	}
	}

	G_GNUC_PRINTF(2, 3)
	static void
	text_err(pcmk__output_t out, const char format, ...) {
	va_list ap;
	int len = 0;

	va_start(ap, format);

	/* Informational output does not get indented, to separate it from other
	* potentially indented list output.
	*/
	len = vfprintf(stderr, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	/* Add a newline. */
	fprintf(stderr, "\n");
	}

	G_GNUC_PRINTF(2, 3)
	static void
	text_info(pcmk__output_t out, const char format, ...) {
	va_list ap;
	int len = 0;

	va_start(ap, format);

	/* Informational output does not get indented, to separate it from other
	* potentially indented list output.
	*/
	len = vfprintf(out->dest, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	/* Add a newline. */
	fprintf(out->dest, "\n");
	}

	static void
	text_output_xml(pcmk__output_t out, const char name, const char *buf) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);
	pcmk__indented_printf(out, "%s", buf);
	}

	G_GNUC_PRINTF(4, 5)
	static void
	text_begin_list(pcmk__output_t out, const char singular_noun, const char *plural_noun,
	const char *format, ...) {
	private_data_t *priv = out->priv;
	text_list_data_t *new_list = NULL;
	va_list ap;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);

	if (fancy && format) {
	pcmk__indented_vprintf(out, format, ap);
	fprintf(out->dest, ":\n");
	}

	va_end(ap);

	new_list = calloc(1, sizeof(text_list_data_t));
	new_list->len = 0;
	new_list->singular_noun = singular_noun == NULL ? NULL : strdup(singular_noun);
	new_list->plural_noun = plural_noun == NULL ? NULL : strdup(plural_noun);

	g_queue_push_tail(priv->parent_q, new_list);
	}

	G_GNUC_PRINTF(3, 4)
	static void
	text_list_item(pcmk__output_t out, const char id, const char *format, ...) {
	private_data_t *priv = out->priv;
	va_list ap;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);

	if (fancy) {
	if (id != NULL) {
	/* Not really a good way to do this all in one call, so make it two.
	* The first handles the indentation and list styling. The second
	* just prints right after that one.
	*/
	pcmk__indented_printf(out, "%s: ", id);
	vfprintf(out->dest, format, ap);
	} else {
	pcmk__indented_vprintf(out, format, ap);
	}
	} else {
	pcmk__indented_vprintf(out, format, ap);
	}

	fputc('\n', out->dest);
	va_end(ap);

	out->increment_list(out);
	}

	static void
	text_increment_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;
	gpointer tail;

	CRM_ASSERT(priv != NULL);
	tail = g_queue_peek_tail(priv->parent_q);
	CRM_ASSERT(tail != NULL);
	((text_list_data_t *) tail)->len++;
	}

	static void
	text_end_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;
	text_list_data_t *node = NULL;

	CRM_ASSERT(priv != NULL);
	node = g_queue_pop_tail(priv->parent_q);

	if (node->singular_noun != NULL && node->plural_noun != NULL) {
	if (node->len == 1) {
	pcmk__indented_printf(out, "%d %s found\n", node->len, node->singular_noun);
	} else {
	pcmk__indented_printf(out, "%d %s found\n", node->len, node->plural_noun);
	}
	}

	free(node);
	}

	pcmk__output_t *
	pcmk__mk_text_output(char **argv) {
	pcmk__output_t *retval = calloc(1, sizeof(pcmk__output_t));

	if (retval == NULL) {
	return NULL;
	}

	retval->fmt_name = "text";
	retval->request = argv == NULL ? NULL : g_strjoinv(" ", argv);
	retval->supports_quiet = true;

	retval->init = text_init;
	retval->free_priv = text_free_priv;
	retval->finish = text_finish;
	retval->reset = text_reset;

	retval->register_message = pcmk__register_message;
	retval->message = pcmk__call_message;

	retval->subprocess_output = text_subprocess_output;
	retval->version = text_version;
	retval->info = text_info;
	retval->err = text_err;
	retval->output_xml = text_output_xml;

	retval->begin_list = text_begin_list;
	retval->list_item = text_list_item;
	retval->increment_list = text_increment_list;
	retval->end_list = text_end_list;

	return retval;
	}

	G_GNUC_PRINTF(2, 0)
	void
	pcmk__indented_vprintf(pcmk__output_t out, const char format, va_list args) {
	int len = 0;

	if (fancy) {
	int level = 0;
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	level = g_queue_get_length(priv->parent_q);

	for (int i = 0; i < level; i++) {
	fprintf(out->dest, " ");
	}

	if (level > 0) {
	fprintf(out->dest, "* ");
	}
	}

	len = vfprintf(out->dest, format, args);
	CRM_ASSERT(len >= 0);
	}

	G_GNUC_PRINTF(2, 3)
	void
	pcmk__indented_printf(pcmk__output_t out, const char format, ...) {
	va_list ap;

	va_start(ap, format);
	pcmk__indented_vprintf(out, format, ap);
	va_end(ap);
	}
	diff --git a/lib/common/output_xml.c b/lib/common/output_xml.c
	index 8565bfeb9f..858da3f359 100644
	--- a/lib/common/output_xml.c
	+++ b/lib/common/output_xml.c
	@@ -1,414 +1,415 @@
	/*
	* Copyright 2019 the Pacemaker project contributors
	*
	* The version control history for this file may have further details.
	*
	* This source code is licensed under the GNU Lesser General Public License
	* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
	*/

	#ifndef _GNU_SOURCE
	# define _GNU_SOURCE
	#endif

	#include <config.h>
	#include <ctype.h>
	#include <stdarg.h>
	#include <stdlib.h>
	#include <stdio.h>
	#include <crm/crm.h>
	#include <crm/common/output.h>
	#include <crm/common/xml.h>
	#include <glib.h>

	static gboolean legacy_xml = FALSE;
	static gboolean simple_list = FALSE;

	GOptionEntry pcmk__xml_output_entries[] = {
	{ "xml-legacy", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &legacy_xml,
	NULL,
	NULL },
	{ "xml-simple-list", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &simple_list,
	NULL,
	NULL },

	{ NULL }
	};

	typedef struct private_data_s {
	xmlNode *root;
	GQueue *parent_q;
	GSList *errors;
	bool legacy_xml;
	} private_data_t;

	static void
	xml_free_priv(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	if (priv == NULL) {
	return;
	}

	xmlFreeNode(priv->root);
	g_queue_free(priv->parent_q);
	g_slist_free(priv->errors);
	free(priv);
	+ out->priv = NULL;
	}

	static bool
	xml_init(pcmk__output_t *out) {
	private_data_t *priv = NULL;

	/* If xml_init was previously called on this output struct, just return. */
	if (out->priv != NULL) {
	return true;
	} else {
	out->priv = calloc(1, sizeof(private_data_t));
	if (out->priv == NULL) {
	return false;
	}

	priv = out->priv;
	}

	if (legacy_xml) {
	priv->root = create_xml_node(NULL, "crm_mon");
	xmlSetProp(priv->root, (pcmkXmlStr) "version", (pcmkXmlStr) VERSION);
	} else {
	priv->root = create_xml_node(NULL, "pacemaker-result");
	xmlSetProp(priv->root, (pcmkXmlStr) "api-version", (pcmkXmlStr) PCMK__API_VERSION);

	if (out->request != NULL) {
	xmlSetProp(priv->root, (pcmkXmlStr) "request", (pcmkXmlStr) out->request);
	}
	}

	priv->parent_q = g_queue_new();
	priv->errors = NULL;
	g_queue_push_tail(priv->parent_q, priv->root);

	/* Copy this from the file-level variable. This means that it is only settable
	* as a command line option, and that pcmk__output_new must be called after all
	* command line processing is completed.
	*/
	priv->legacy_xml = legacy_xml;

	return true;
	}

	static void
	add_error_node(gpointer data, gpointer user_data) {
	char str = (char ) data;
	xmlNodePtr node = (xmlNodePtr) user_data;
	pcmk_create_xml_text_node(node, "error", str);
	}

	static void
	xml_finish(pcmk__output_t out, crm_exit_t exit_status, bool print, void *copy_dest) {
	xmlNodePtr node;
	private_data_t *priv = out->priv;

	/* If root is NULL, xml_init failed and we are being called from pcmk__output_free
	* in the pcmk__output_new path.
	*/
	if (priv == NULL \|\| priv->root == NULL) {
	return;
	}

	if (legacy_xml) {
	GSList *node = priv->errors;

	if (exit_status != CRM_EX_OK) {
	fprintf(stderr, "%s\n", crm_exit_str(exit_status));
	}

	while (node != NULL) {
	fprintf(stderr, "%s\n", (char *) node->data);
	node = node->next;
	}
	} else {
	char *rc_as_str = crm_itoa(exit_status);

	node = create_xml_node(priv->root, "status");
	xmlSetProp(node, (pcmkXmlStr) "code", (pcmkXmlStr) rc_as_str);
	xmlSetProp(node, (pcmkXmlStr) "message", (pcmkXmlStr) crm_exit_str(exit_status));

	if (g_slist_length(priv->errors) > 0) {
	xmlNodePtr errors_node = create_xml_node(node, "errors");
	g_slist_foreach(priv->errors, add_error_node, (gpointer) errors_node);
	}

	free(rc_as_str);
	}

	if (print) {
	char *buf = dump_xml_formatted_with_text(priv->root);
	fprintf(out->dest, "%s", buf);
	free(buf);
	}

	if (copy_dest != NULL) {
	*copy_dest = copy_xml(priv->root);
	}
	}

	static void
	xml_reset(pcmk__output_t *out) {
	char *buf = NULL;

	CRM_ASSERT(out != NULL);

	if (out->priv != NULL) {
	private_data_t *priv = out->priv;
	buf = dump_xml_formatted_with_text(priv->root);
	fprintf(out->dest, "%s", buf);
	free(buf);
	}

	xml_free_priv(out);
	xml_init(out);
	}

	static void
	xml_subprocess_output(pcmk__output_t *out, int exit_status,
	const char proc_stdout, const char proc_stderr) {
	xmlNodePtr node, child_node;
	char *rc_as_str = NULL;

	rc_as_str = crm_itoa(exit_status);

	node = pcmk__output_xml_create_parent(out, "command");
	xmlSetProp(node, (pcmkXmlStr) "code", (pcmkXmlStr) rc_as_str);

	if (proc_stdout != NULL) {
	child_node = pcmk_create_xml_text_node(node, "output", proc_stdout);
	xmlSetProp(child_node, (pcmkXmlStr) "source", (pcmkXmlStr) "stdout");
	}

	if (proc_stderr != NULL) {
	child_node = pcmk_create_xml_text_node(node, "output", proc_stderr);
	xmlSetProp(child_node, (pcmkXmlStr) "source", (pcmkXmlStr) "stderr");
	}

	pcmk__output_xml_add_node(out, node);
	free(rc_as_str);
	}

	static void
	xml_version(pcmk__output_t *out, bool extended) {
	xmlNodePtr node;
	private_data_t *priv = out->priv;
	CRM_ASSERT(priv != NULL);

	node = pcmk__output_create_xml_node(out, "version");
	xmlSetProp(node, (pcmkXmlStr) "program", (pcmkXmlStr) "Pacemaker");
	xmlSetProp(node, (pcmkXmlStr) "version", (pcmkXmlStr) PACEMAKER_VERSION);
	xmlSetProp(node, (pcmkXmlStr) "author", (pcmkXmlStr) "Andrew Beekhof");
	xmlSetProp(node, (pcmkXmlStr) "build", (pcmkXmlStr) BUILD_VERSION);
	xmlSetProp(node, (pcmkXmlStr) "features", (pcmkXmlStr) CRM_FEATURES);
	}

	G_GNUC_PRINTF(2, 3)
	static void
	xml_err(pcmk__output_t out, const char format, ...) {
	private_data_t *priv = out->priv;
	int len = 0;
	char *buf = NULL;
	va_list ap;

	CRM_ASSERT(priv != NULL);
	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	CRM_ASSERT(len > 0);
	va_end(ap);

	priv->errors = g_slist_append(priv->errors, buf);
	}

	G_GNUC_PRINTF(2, 3)
	static void
	xml_info(pcmk__output_t out, const char format, ...) {
	/* This function intentially left blank */
	}

	static void
	xml_output_xml(pcmk__output_t out, const char name, const char *buf) {
	xmlNodePtr parent = NULL;
	xmlNodePtr cdata_node = NULL;
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	parent = pcmk__output_create_xml_node(out, name);
	cdata_node = xmlNewCDataBlock(getDocPtr(parent), (pcmkXmlStr) buf, strlen(buf));
	xmlAddChild(parent, cdata_node);
	}

	G_GNUC_PRINTF(4, 5)
	static void
	xml_begin_list(pcmk__output_t out, const char singular_noun, const char *plural_noun,
	const char *format, ...) {
	va_list ap;
	char *buf = NULL;
	int len;

	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	if (legacy_xml \|\| simple_list) {
	pcmk__output_xml_create_parent(out, buf);
	} else {
	xmlNodePtr list_node = NULL;

	list_node = pcmk__output_xml_create_parent(out, "list");
	xmlSetProp(list_node, (pcmkXmlStr) "name", (pcmkXmlStr) buf);
	}

	free(buf);
	}

	G_GNUC_PRINTF(3, 4)
	static void
	xml_list_item(pcmk__output_t out, const char name, const char *format, ...) {
	private_data_t *priv = out->priv;
	xmlNodePtr item_node = NULL;
	va_list ap;
	char *buf = NULL;
	int len;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);
	len = vasprintf(&buf, format, ap);
	CRM_ASSERT(len >= 0);
	va_end(ap);

	item_node = pcmk__output_create_xml_text_node(out, "item", buf);
	free(buf);

	xmlSetProp(item_node, (pcmkXmlStr) "name", (pcmkXmlStr) name);
	}

	static void
	xml_increment_list(pcmk__output_t *out) {
	/* This function intentially left blank */
	}

	static void
	xml_end_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	if (priv->legacy_xml \|\| simple_list) {
	g_queue_pop_tail(priv->parent_q);
	} else {
	char *buf = NULL;
	xmlNodePtr node;

	node = g_queue_pop_tail(priv->parent_q);
	buf = crm_strdup_printf("%lu", xmlChildElementCount(node));
	xmlSetProp(node, (pcmkXmlStr) "count", (pcmkXmlStr) buf);
	free(buf);
	}
	}

	pcmk__output_t *
	pcmk__mk_xml_output(char **argv) {
	pcmk__output_t *retval = calloc(1, sizeof(pcmk__output_t));

	if (retval == NULL) {
	return NULL;
	}

	retval->fmt_name = "xml";
	retval->request = argv == NULL ? NULL : g_strjoinv(" ", argv);
	retval->supports_quiet = false;

	retval->init = xml_init;
	retval->free_priv = xml_free_priv;
	retval->finish = xml_finish;
	retval->reset = xml_reset;

	retval->register_message = pcmk__register_message;
	retval->message = pcmk__call_message;

	retval->subprocess_output = xml_subprocess_output;
	retval->version = xml_version;
	retval->info = xml_info;
	retval->err = xml_err;
	retval->output_xml = xml_output_xml;

	retval->begin_list = xml_begin_list;
	retval->list_item = xml_list_item;
	retval->increment_list = xml_increment_list;
	retval->end_list = xml_end_list;

	return retval;
	}

	xmlNodePtr
	pcmk__output_xml_create_parent(pcmk__output_t out, const char name) {
	xmlNodePtr node = pcmk__output_create_xml_node(out, name);
	pcmk__output_xml_push_parent(out, node);
	return node;
	}

	void
	pcmk__output_xml_add_node(pcmk__output_t *out, xmlNodePtr node) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);
	CRM_ASSERT(node != NULL);

	xmlAddChild(g_queue_peek_tail(priv->parent_q), node);
	}

	xmlNodePtr
	pcmk__output_create_xml_node(pcmk__output_t out, const char name) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	return create_xml_node(g_queue_peek_tail(priv->parent_q), name);
	}

	xmlNodePtr
	pcmk__output_create_xml_text_node(pcmk__output_t out, const char name, const char *content) {
	xmlNodePtr node = pcmk__output_create_xml_node(out, name);
	xmlNodeSetContent(node, (pcmkXmlStr) content);
	return node;
	}

	void
	pcmk__output_xml_push_parent(pcmk__output_t *out, xmlNodePtr parent) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);
	CRM_ASSERT(parent != NULL);

	g_queue_push_tail(priv->parent_q, parent);
	}

	void
	pcmk__output_xml_pop_parent(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);
	CRM_ASSERT(g_queue_get_length(priv->parent_q) > 0);

	g_queue_pop_tail(priv->parent_q);
	}

	xmlNodePtr
	pcmk__output_xml_peek_parent(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	/* If queue is empty NULL will be returned */
	return g_queue_peek_tail(priv->parent_q);
	}
	diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c
	index d93b8475e3..e9cc023a14 100644
	--- a/tools/crm_mon_curses.c
	+++ b/tools/crm_mon_curses.c
	@@ -1,425 +1,426 @@
	/*
	* Copyright 2019 the Pacemaker project contributors
	*
	* The version control history for this file may have further details.
	*
	* This source code is licensed under the GNU Lesser General Public License
	* version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
	*/

	#include <crm_internal.h>
	#include <stdarg.h>
	#include <stdlib.h>
	#include <crm/crm.h>
	#include <crm/common/curses_internal.h>
	#include <crm/common/output.h>
	#include <crm/stonith-ng.h>
	#include <crm/fencing/internal.h>
	#include <crm/pengine/internal.h>
	#include <glib.h>

	#include "crm_mon.h"

	#if CURSES_ENABLED

	GOptionEntry crm_mon_curses_output_entries[] = {
	{ NULL }
	};

	typedef struct curses_list_data_s {
	unsigned int len;
	char *singular_noun;
	char *plural_noun;
	} curses_list_data_t;

	typedef struct private_data_s {
	GQueue *parent_q;
	} private_data_t;

	static void
	curses_free_priv(pcmk__output_t *out) {
	private_data_t *priv = out->priv;

	if (priv == NULL) {
	return;
	}

	g_queue_free(priv->parent_q);
	free(priv);
	+ out->priv = NULL;
	}

	static bool
	curses_init(pcmk__output_t *out) {
	private_data_t *priv = NULL;

	/* If curses_init was previously called on this output struct, just return. */
	if (out->priv != NULL) {
	return true;
	} else {
	out->priv = calloc(1, sizeof(private_data_t));
	if (out->priv == NULL) {
	return false;
	}

	priv = out->priv;
	}

	priv->parent_q = g_queue_new();

	initscr();
	cbreak();
	noecho();

	return true;
	}

	static void
	curses_finish(pcmk__output_t out, crm_exit_t exit_status, bool print, void *copy_dest) {
	echo();
	nocbreak();
	endwin();
	}

	static void
	curses_reset(pcmk__output_t *out) {
	CRM_ASSERT(out != NULL);

	curses_free_priv(out);
	curses_init(out);
	}

	static void
	curses_subprocess_output(pcmk__output_t *out, int exit_status,
	const char proc_stdout, const char proc_stderr) {
	if (proc_stdout != NULL) {
	printw("%s\n", proc_stdout);
	}

	if (proc_stderr != NULL) {
	printw("%s\n", proc_stderr);
	}

	clrtoeol();
	refresh();
	}

	/* curses_version is defined in curses.h, so we can't use that name here.
	* Note that this function prints out via text, not with curses.
	*/
	static void
	curses_ver(pcmk__output_t *out, bool extended) {
	if (extended) {
	printf("Pacemaker %s (Build: %s): %s\n", PACEMAKER_VERSION, BUILD_VERSION, CRM_FEATURES);
	} else {
	printf("Pacemaker %s\n", PACEMAKER_VERSION);
	printf("Written by Andrew Beekhof\n");
	}
	}

	G_GNUC_PRINTF(2, 3)
	static void
	curses_error(pcmk__output_t out, const char format, ...) {
	va_list ap;

	/* Informational output does not get indented, to separate it from other
	* potentially indented list output.
	*/
	va_start(ap, format);
	vw_printw(stdscr, format, ap);
	va_end(ap);

	/* Add a newline. */
	addch('\n');

	clrtoeol();
	refresh();
	sleep(2);
	}

	G_GNUC_PRINTF(2, 3)
	static void
	curses_info(pcmk__output_t out, const char format, ...) {
	va_list ap;

	/* Informational output does not get indented, to separate it from other
	* potentially indented list output.
	*/
	va_start(ap, format);
	vw_printw(stdscr, format, ap);
	va_end(ap);

	/* Add a newline. */
	addch('\n');

	clrtoeol();
	refresh();
	}

	static void
	curses_output_xml(pcmk__output_t out, const char name, const char *buf) {
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);
	curses_indented_printf(out, "%s", buf);
	}

	G_GNUC_PRINTF(4, 5)
	static void
	curses_begin_list(pcmk__output_t out, const char singular_noun, const char *plural_noun,
	const char *format, ...) {
	private_data_t *priv = out->priv;
	curses_list_data_t *new_list = NULL;
	va_list ap;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);

	curses_indented_vprintf(out, format, ap);
	printw(":\n");

	va_end(ap);

	new_list = calloc(1, sizeof(curses_list_data_t));
	new_list->len = 0;
	new_list->singular_noun = singular_noun == NULL ? NULL : strdup(singular_noun);
	new_list->plural_noun = plural_noun == NULL ? NULL : strdup(plural_noun);

	g_queue_push_tail(priv->parent_q, new_list);
	}

	G_GNUC_PRINTF(3, 4)
	static void
	curses_list_item(pcmk__output_t out, const char id, const char *format, ...) {
	private_data_t *priv = out->priv;
	va_list ap;

	CRM_ASSERT(priv != NULL);

	va_start(ap, format);

	if (id != NULL) {
	curses_indented_printf(out, "%s: ", id);
	vw_printw(stdscr, format, ap);
	} else {
	curses_indented_vprintf(out, format, ap);
	}

	addch('\n');
	va_end(ap);

	out->increment_list(out);
	}

	static void
	curses_increment_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;
	gpointer tail;

	CRM_ASSERT(priv != NULL);
	tail = g_queue_peek_tail(priv->parent_q);
	CRM_ASSERT(tail != NULL);
	((curses_list_data_t *) tail)->len++;
	}

	static void
	curses_end_list(pcmk__output_t *out) {
	private_data_t *priv = out->priv;
	curses_list_data_t *node = NULL;

	CRM_ASSERT(priv != NULL);
	node = g_queue_pop_tail(priv->parent_q);

	if (node->singular_noun != NULL && node->plural_noun != NULL) {
	if (node->len == 1) {
	curses_indented_printf(out, "%d %s found\n", node->len, node->singular_noun);
	} else {
	curses_indented_printf(out, "%d %s found\n", node->len, node->plural_noun);
	}
	}

	free(node);
	}

	pcmk__output_t *
	crm_mon_mk_curses_output(char **argv) {
	pcmk__output_t *retval = calloc(1, sizeof(pcmk__output_t));

	if (retval == NULL) {
	return NULL;
	}

	retval->fmt_name = "console";
	retval->request = argv == NULL ? NULL : g_strjoinv(" ", argv);
	retval->supports_quiet = true;

	retval->init = curses_init;
	retval->free_priv = curses_free_priv;
	retval->finish = curses_finish;
	retval->reset = curses_reset;

	retval->register_message = pcmk__register_message;
	retval->message = pcmk__call_message;

	retval->subprocess_output = curses_subprocess_output;
	retval->version = curses_ver;
	retval->err = curses_error;
	retval->info = curses_info;
	retval->output_xml = curses_output_xml;

	retval->begin_list = curses_begin_list;
	retval->list_item = curses_list_item;
	retval->increment_list = curses_increment_list;
	retval->end_list = curses_end_list;

	return retval;
	}

	G_GNUC_PRINTF(2, 0)
	void
	curses_indented_vprintf(pcmk__output_t out, const char format, va_list args) {
	int level = 0;
	private_data_t *priv = out->priv;

	CRM_ASSERT(priv != NULL);

	level = g_queue_get_length(priv->parent_q);

	for (int i = 0; i < level; i++) {
	printw(" ");
	}

	if (level > 0) {
	printw("* ");
	}

	vw_printw(stdscr, format, args);

	clrtoeol();
	refresh();
	}

	G_GNUC_PRINTF(2, 3)
	void
	curses_indented_printf(pcmk__output_t out, const char format, ...) {
	va_list ap;

	va_start(ap, format);
	curses_indented_vprintf(out, format, ap);
	va_end(ap);
	}

	PCMK__OUTPUT_ARGS("stonith-event", "stonith_history_t *", "gboolean", "gboolean")
	static int
	stonith_event_console(pcmk__output_t *out, va_list args) {
	stonith_history_t event = va_arg(args, stonith_history_t );
	gboolean full_history = va_arg(args, gboolean);
	gboolean later_succeeded = va_arg(args, gboolean);

	crm_time_t *crm_when = crm_time_new(NULL);
	char *buf = NULL;

	crm_time_set_timet(crm_when, &(event->completed));
	buf = crm_time_as_string(crm_when, crm_time_log_date \| crm_time_log_timeofday \| crm_time_log_with_timezone);

	switch (event->state) {
	case st_failed:
	curses_indented_printf(out, "%s of %s failed: delegate=%s, client=%s, origin=%s, %s='%s'%s\n",
	stonith_action_str(event->action), event->target,
	event->delegate ? event->delegate : "",
	event->client, event->origin,
	full_history ? "completed" : "last-failed", buf,
	later_succeeded ? " (a later attempt succeeded)" : "");
	break;

	case st_done:
	curses_indented_printf(out, "%s of %s successful: delegate=%s, client=%s, origin=%s, %s='%s'\n",
	stonith_action_str(event->action), event->target,
	event->delegate ? event->delegate : "",
	event->client, event->origin,
	full_history ? "completed" : "last-successful", buf);
	break;

	default:
	curses_indented_printf(out, "%s of %s pending: client=%s, origin=%s\n",
	stonith_action_str(event->action), event->target,
	event->client, event->origin);
	break;
	}

	free(buf);
	crm_time_free(crm_when);
	return pcmk_rc_ok;
	}

	PCMK__OUTPUT_ARGS("maint-mode")
	static int
	cluster_maint_mode_console(pcmk__output_t *out, va_list args) {
	printw("\n * Resource management is DISABLED *");
	printw("\n The cluster will not attempt to start, stop or recover services");
	printw("\n");
	clrtoeol();
	refresh();
	return pcmk_rc_ok;
	}

	static pcmk__message_entry_t fmt_functions[] = {
	{ "ban", "console", pe__ban_text },
	{ "bundle", "console", pe__bundle_text },
	{ "clone", "console", pe__clone_text },
	{ "cluster-counts", "console", pe__cluster_counts_text },
	{ "cluster-dc", "console", pe__cluster_dc_text },
	{ "cluster-options", "console", pe__cluster_options_text },
	{ "cluster-stack", "console", pe__cluster_stack_text },
	{ "cluster-summary", "console", pe__cluster_summary },
	{ "cluster-times", "console", pe__cluster_times_text },
	{ "failed-action", "console", pe__failed_action_text },
	{ "failed-fencing-history", "console", stonith__failed_history },
	{ "fencing-history", "console", stonith__history },
	{ "full-fencing-history", "console", stonith__full_history },
	{ "group", "console", pe__group_text },
	{ "maint-mode", "console", cluster_maint_mode_console },
	{ "node", "console", pe__node_text },
	{ "node-attribute", "console", pe__node_attribute_text },
	{ "node-list", "console", pe__node_list_text },
	{ "op-history", "console", pe__op_history_text },
	{ "pending-fencing-actions", "console", stonith__pending_actions },
	{ "primitive", "console", pe__resource_text },
	{ "resource-history", "console", pe__resource_history_text },
	{ "stonith-event", "console", stonith_event_console },
	{ "ticket", "console", pe__ticket_text },

	{ NULL, NULL, NULL }
	};

	void
	crm_mon_register_messages(pcmk__output_t *out) {
	pcmk__register_messages(out, fmt_functions);
	}

	#else

	pcmk__output_t *
	crm_mon_mk_curses_output(char **argv) {
	/* curses was disabled in the build, so fall back to text. */
	return pcmk__mk_text_output(argv);
	}

	G_GNUC_PRINTF(2, 0)
	void
	curses_indented_vprintf(pcmk__output_t out, const char format, va_list args) {
	return;
	}

	G_GNUC_PRINTF(2, 3)
	void
	curses_indented_printf(pcmk__output_t out, const char format, ...) {
	return;
	}

	void
	crm_mon_register_messages(pcmk__output_t *out) {
	return;
	}

	#endif

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 6:59 AM (1 d, 19 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018367
Default Alt Text: (49 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions