MFC r320267, r320270-r320271, r320478

r320267:
Do not use sprintf(3) when not needed, while here,
prefer snprintf(3) over sprintf(3)

r320270:
Directly print the extra status instead of filling a buffer
then printing it.

This prepares the code to make it libxo friendly

Reviewed by:	manu, Nikita Kozlov (nikita elyzion.net)
Sponsored by:	Gandi.net

r320271:
sesutil no longer depends on libsbuf

Sponsored by:	Gandi.net

r320478:
Add libxo(3) support to sesutil(8)

This is useful to simplify parsing "sesutil map"

Submitted by:	nikita.kozlov@blade-group.com
Relnotes:	yes
Reviewed by:	Allanjude, bapt
Differential revision:	https://reviews.freebsd.org/D11372
Sponsored by:	blade

6 files changed, 193 insertions, 188 deletions

diff --git a/usr.sbin/sesutil/Makefile b/usr.sbin/sesutil/Makefile
index bf37192..fc39434 100644
--- a/usr.sbin/sesutil/Makefile
+++ b/usr.sbin/sesutil/Makefile
@@ -4,6 +4,6 @@ PROG=	sesutil
 SRCS=	sesutil.c eltsub.c
 MAN=	sesutil.8
 
-LIBADD=	sbuf
+LIBADD=	xo
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sesutil/Makefile.depend b/usr.sbin/sesutil/Makefile.depend
index 6002005..757244a 100644
--- a/usr.sbin/sesutil/Makefile.depend
+++ b/usr.sbin/sesutil/Makefile.depend
@@ -8,8 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libcompiler_rt \
-	lib/libsbuf \
+	lib/libcompiler_rt
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/sesutil/eltsub.c b/usr.sbin/sesutil/eltsub.c
index f7c4b9d..49814d5 100644
--- a/usr.sbin/sesutil/eltsub.c
+++ b/usr.sbin/sesutil/eltsub.c
@@ -32,15 +32,14 @@
  * mjacob@feral.com
  */
 
-#include <sys/endian.h>
 #include <sys/types.h>
-#include <sys/sbuf.h>
 
 #include <err.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <cam/scsi/scsi_enc.h>
+#include <libxo/xo.h>
 
 #include "eltsub.h"
 
@@ -51,181 +50,95 @@
  */
 #define TEMPERATURE_OFFSET 20
 
-char *
+const char *
 geteltnm(int type)
 {
 	static char rbuf[132];
 
 	switch (type) {
 	case ELMTYP_UNSPECIFIED:
-		sprintf(rbuf, "Unspecified");
-		break;
+		return ("Unspecified");
 	case ELMTYP_DEVICE:
-		sprintf(rbuf, "Device Slot");
-		break;
+		return ("Device Slot");
 	case ELMTYP_POWER:
-		sprintf(rbuf, "Power Supply");
-		break;
+		return ("Power Supply");
 	case ELMTYP_FAN:
-		sprintf(rbuf, "Cooling");
-		break;
+		return ("Cooling");
 	case ELMTYP_THERM:
-		sprintf(rbuf, "Temperature Sensors");
-		break;
+		return ("Temperature Sensors");
 	case ELMTYP_DOORLOCK:
-		sprintf(rbuf, "Door Lock");
-		break;
+		return ("Door Lock");
 	case ELMTYP_ALARM:
-		sprintf(rbuf, "Audible alarm");
-		break;
+		return ("Audible alarm");
 	case ELMTYP_ESCC:
-		sprintf(rbuf, "Enclosure Services Controller Electronics");
-		break;
+		return ("Enclosure Services Controller Electronics");
 	case ELMTYP_SCC:
-		sprintf(rbuf, "SCC Controller Electronics");
-		break;
+		return ("SCC Controller Electronics");
 	case ELMTYP_NVRAM:
-		sprintf(rbuf, "Nonvolatile Cache");
-		break;
+		return ("Nonvolatile Cache");
 	case ELMTYP_INV_OP_REASON:
-		sprintf(rbuf, "Invalid Operation Reason");
-		break;
+		return ("Invalid Operation Reason");
 	case ELMTYP_UPS:
-		sprintf(rbuf, "Uninterruptible Power Supply");
-		break;
+		return ("Uninterruptible Power Supply");
 	case ELMTYP_DISPLAY:
-		sprintf(rbuf, "Display");
-		break;
+		return ("Display");
 	case ELMTYP_KEYPAD:
-		sprintf(rbuf, "Key Pad Entry");
-		break;
+		return ("Key Pad Entry");
 	case ELMTYP_ENCLOSURE:
-		sprintf(rbuf, "Enclosure");
-		break;
+		return ("Enclosure");
 	case ELMTYP_SCSIXVR:
-		sprintf(rbuf, "SCSI Port/Transceiver");
-		break;
+		return ("SCSI Port/Transceiver");
 	case ELMTYP_LANGUAGE:
-		sprintf(rbuf, "Language");
-		break;
+		return ("Language");
 	case ELMTYP_COMPORT:
-		sprintf(rbuf, "Communication Port");
-		break;
+		return ("Communication Port");
 	case ELMTYP_VOM:
-		sprintf(rbuf, "Voltage Sensor");
-		break;
+		return ("Voltage Sensor");
 	case ELMTYP_AMMETER:
-		sprintf(rbuf, "Current Sensor");
-		break;
+		return ("Current Sensor");
 	case ELMTYP_SCSI_TGT:
-		sprintf(rbuf, "SCSI Target Port");
-		break;
+		return ("SCSI Target Port");
 	case ELMTYP_SCSI_INI:
-		sprintf(rbuf, "SCSI Initiator Port");
-		break;
+		return ("SCSI Initiator Port");
 	case ELMTYP_SUBENC:
-		sprintf(rbuf, "Simple Subenclosure");
-		break;
+		return ("Simple Subenclosure");
 	case ELMTYP_ARRAY_DEV:
-		sprintf(rbuf, "Array Device Slot");
-		break;
+		return ("Array Device Slot");
 	case ELMTYP_SAS_EXP:
-		sprintf(rbuf, "SAS Expander");
-		break;
+		return ("SAS Expander");
 	case ELMTYP_SAS_CONN:
-		sprintf(rbuf, "SAS Connector");
-		break;
+		return ("SAS Connector");
 	default:
-		(void) sprintf(rbuf, "<Type 0x%x>", type);
-		break;
+		snprintf(rbuf, sizeof(rbuf), "<Type 0x%x>", type);
+		return (rbuf);
 	}
-	return (rbuf);
 }
 
-char *
+const char *
 scode2ascii(u_char code)
 {
 	static char rbuf[32];
 	switch (code & 0xf) {
 	case SES_OBJSTAT_UNSUPPORTED:
-		sprintf(rbuf, "Unsupported");
-		break;
+		return ("Unsupported");
 	case SES_OBJSTAT_OK:
-		sprintf(rbuf, "OK");
-		break;
+		return ("OK");
 	case SES_OBJSTAT_CRIT:
-		sprintf(rbuf, "Critical");
-		break;
+		return ("Critical");
 	case SES_OBJSTAT_NONCRIT:
-		sprintf(rbuf, "Noncritical");
-		break;
+		return ("Noncritical");
 	case SES_OBJSTAT_UNRECOV:
-		sprintf(rbuf, "Unrecoverable");
-		break;
+		return ("Unrecoverable");
 	case SES_OBJSTAT_NOTINSTALLED:
-		sprintf(rbuf, "Not Installed");
-		break;
+		return ("Not Installed");
 	case SES_OBJSTAT_UNKNOWN:
-		sprintf(rbuf, "Unknown");
-		break;
+		return ("Unknown");
 	case SES_OBJSTAT_NOTAVAIL:
-		sprintf(rbuf, "Not Available");
-		break;
+		return ("Not Available");
 	case SES_OBJSTAT_NOACCESS:
-		sprintf(rbuf, "No Access Allowed");
-		break;
+		return ("No Access Allowed");
 	default:
-		sprintf(rbuf, "<Status 0x%x>", code & 0xf);
-		break;
+		snprintf(rbuf, sizeof(rbuf), "<Status 0x%x>", code & 0xf);
+		return (rbuf);
 	}
-	return (rbuf);
-}
-
-struct sbuf *
-stat2sbuf(int eletype, u_char *cstat)
-{
-	struct sbuf *buf;
-
-	buf = sbuf_new_auto();
-	if (buf == NULL)
-		err(EXIT_FAILURE, "sbuf_new_auto()");
-
-	if (cstat[0] & 0x40)
-		sbuf_printf(buf, "\t\t- Predicted Failure\n");
-	if (cstat[0] & 0x20)
-		sbuf_printf(buf, "\t\t- Disabled\n");
-	if (cstat[0] & 0x10)
-		sbuf_printf(buf, "\t\t- Swapped\n");
-	switch (eletype) {
-	case ELMTYP_DEVICE:
-		if (cstat[2] & 0x02)
-			sbuf_printf(buf, "\t\t- LED=locate\n");
-		if (cstat[2] & 0x20)
-			sbuf_printf(buf, "\t\t- LED=fault\n");
-		break;
-	case ELMTYP_ARRAY_DEV:
-		if (cstat[2] & 0x02)
-			sbuf_printf(buf, "\t\t- LED=locate\n");
-		if (cstat[2] & 0x20)
-			sbuf_printf(buf, "\t\t- LED=fault\n");
-		break;
-	case ELMTYP_FAN:
-		sbuf_printf(buf, "\t\t- Speed: %d rpm\n",
-		    (((0x7 & cstat[1]) << 8) + cstat[2]) * 10);
-		break;
-	case ELMTYP_THERM:
-		if (cstat[2]) {
-			sbuf_printf(buf, "\t\t- Temperature: %d C\n",
-			    cstat[2] - TEMPERATURE_OFFSET);
-		} else {
-			sbuf_printf(buf, "\t\t- Temperature: -reserved-\n");
-		}
-		break;
-	case ELMTYP_VOM:
-		sbuf_printf(buf, "\t\t- Voltage: %.2f V\n",
-		    be16dec(cstat + 2) / 100.0);
-		break;
-	}
-	sbuf_finish(buf);
-	return (buf);
 }
diff --git a/usr.sbin/sesutil/eltsub.h b/usr.sbin/sesutil/eltsub.h
index 299ada3..d1818ef 100644
--- a/usr.sbin/sesutil/eltsub.h
+++ b/usr.sbin/sesutil/eltsub.h
@@ -32,6 +32,5 @@
  * mjacob@feral.com
  */
 
-char *geteltnm(int);
-char *scode2ascii(u_char);
-struct sbuf *stat2sbuf(int, u_char *);
+const char *geteltnm(int);
+const char *scode2ascii(u_char);
diff --git a/usr.sbin/sesutil/sesutil.8 b/usr.sbin/sesutil/sesutil.8
index 79d0f66..3c2f3e0 100644
--- a/usr.sbin/sesutil/sesutil.8
+++ b/usr.sbin/sesutil/sesutil.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 6, 2015
+.Dd June 29, 2017
 .Dt SESUTIL 8
 .Os
 .Sh NAME
@@ -43,9 +43,11 @@
 .Op on | off
 .Nm
 .Cm map
+.Op Fl -libxo Ar options
 .Op Fl u Ar /dev/sesN
 .Nm
 .Cm status
+.Op Fl -libxo Ar options
 .Op Fl u Ar /dev/sesN
 .Sh DESCRIPTION
 The
@@ -55,6 +57,12 @@ Services (SES) devices.
 .Pp
 List of supported commands:
 .Bl -tag -width indent
+.It Fl -libxo
+Generate output via
+.Xr libxo 3
+in a selection of different human and machine readable formats.
+See
+.Xr xo_parse_args 3
 .It Cm fault Oo Fl u Ar /dev/sesN Oc Ao Ar disk | Li all Ac Op on | off
 Change the state of the external fault LED associated with
 .Ar disk .
@@ -114,6 +122,8 @@ Turn on the fault LED for a drive bay not associated with a device:
 .Pp
 .Dl Nm Cm fault -u /dev/ses2 7 on
 .Sh SEE ALSO
+.Xr libxo 3 ,
+.Xr xo_parse_args 3 ,
 .Xr ses 4
 .Sh HISTORY
 The
diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c
index d666b60..b31c198 100644
--- a/usr.sbin/sesutil/sesutil.c
+++ b/usr.sbin/sesutil/sesutil.c
@@ -29,10 +29,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <sys/sbuf.h>
 
 #include <err.h>
 #include <errno.h>
@@ -46,16 +46,20 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <libxo/xo.h>
 
 #include <cam/scsi/scsi_enc.h>
 
 #include "eltsub.h"
 
+#define SESUTIL_XO_VERSION	"1"
+
 static int encstatus(int argc, char **argv);
 static int fault(int argc, char **argv);
 static int locate(int argc, char **argv);
 static int objmap(int argc, char **argv);
 static int sesled(int argc, char **argv, bool fault);
+static void sesutil_print(bool *title, const char *fmt, ...) __printflike(2,3);
 
 static struct command {
 	const char *name;
@@ -115,7 +119,7 @@ do_led(int fd, unsigned int idx, bool onoff, bool setfault)
 	o.elm_idx = idx;
 	if (ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t) &o) < 0) {
 		close(fd);
-		err(EXIT_FAILURE, "ENCIOC_GETELMSTAT");
+		xo_err(EXIT_FAILURE, "ENCIOC_GETELMSTAT");
 	}
 	o.cstat[0] |= 0x80;
 	if (setfault) {
@@ -132,7 +136,7 @@ do_led(int fd, unsigned int idx, bool onoff, bool setfault)
 
 	if (ioctl(fd, ENCIOC_SETELMSTAT, (caddr_t) &o) < 0) {
 		close(fd);
-		err(EXIT_FAILURE, "ENCIOC_SETELMSTAT");
+		xo_err(EXIT_FAILURE, "ENCIOC_SETELMSTAT");
 	}
 }
 
@@ -178,7 +182,7 @@ sesled(int argc, char **argv, bool setfault)
 	if (*endptr == '\0') {
 		endptr = strrchr(uflag, '*');
 		if (endptr != NULL && *endptr == '*') {
-			warnx("Must specifying a SES device (-u) to use a SES "
+			xo_warnx("Must specifying a SES device (-u) to use a SES "
 			    "id# to identify a disk");
 			usage(stderr, (setfault ? "fault" : "locate"));
 		}
@@ -202,7 +206,7 @@ sesled(int argc, char **argv, bool setfault)
 	if (glob((uflag != NULL ? uflag : "/dev/ses[0-9]*"), 0, NULL, &g) ==
 	    GLOB_NOMATCH) {
 		globfree(&g);
-		errx(EXIT_FAILURE, "No SES devices found");
+		xo_errx(EXIT_FAILURE, "No SES devices found");
 	}
 
 	ndisks = 0;
@@ -218,32 +222,32 @@ sesled(int argc, char **argv, bool setfault)
 			 * accessing all devices
 			 */
 			if (errno == EACCES && g.gl_pathc > 1) {
-				err(EXIT_FAILURE, "unable to access SES device");
+				xo_err(EXIT_FAILURE, "unable to access SES device");
 			}
-			warn("unable to access SES device: %s", g.gl_pathv[i]);
+			xo_warn("unable to access SES device: %s", g.gl_pathv[i]);
 			continue;
 		}
 
 		if (ioctl(fd, ENCIOC_GETNELM, (caddr_t) &nobj) < 0) {
 			close(fd);
-			err(EXIT_FAILURE, "ENCIOC_GETNELM");
+			xo_err(EXIT_FAILURE, "ENCIOC_GETNELM");
 		}
 
 		objp = calloc(nobj, sizeof(encioc_element_t));
 		if (objp == NULL) {
 			close(fd);
-			err(EXIT_FAILURE, "calloc()");
+			xo_err(EXIT_FAILURE, "calloc()");
 		}
 
 		if (ioctl(fd, ENCIOC_GETELMMAP, (caddr_t) objp) < 0) {
 			close(fd);
-			err(EXIT_FAILURE, "ENCIOC_GETELMMAP");
+			xo_err(EXIT_FAILURE, "ENCIOC_GETELMMAP");
 		}
 
 		if (isses) {
 			if (sesid > nobj) {
 				close(fd);
-				errx(EXIT_FAILURE,
+				xo_errx(EXIT_FAILURE,
 				     "Requested SES ID does not exist");
 			}
 			do_led(fd, sesid, onoff, setfault);
@@ -262,7 +266,7 @@ sesled(int argc, char **argv, bool setfault)
 			objdn.elm_devnames = calloc(128, sizeof(char));
 			if (objdn.elm_devnames == NULL) {
 				close(fd);
-				err(EXIT_FAILURE, "calloc()");
+				xo_err(EXIT_FAILURE, "calloc()");
 			}
 			if (ioctl(fd, ENCIOC_GETELMDEVNAMES,
 			    (caddr_t) &objdn) <0) {
@@ -282,7 +286,7 @@ sesled(int argc, char **argv, bool setfault)
 	}
 	globfree(&g);
 	if (ndisks == 0 && all == false) {
-		errx(EXIT_FAILURE, "Count not find the SES id of device '%s'",
+		xo_errx(EXIT_FAILURE, "Count not find the SES id of device '%s'",
 		    disk);
 	}
 
@@ -303,10 +307,71 @@ fault(int argc, char **argv)
 	return (sesled(argc, argv, true));
 }
 
+#define TEMPERATURE_OFFSET 20
+static void
+sesutil_print(bool *title, const char *fmt, ...)
+{
+	va_list args;
+
+	if (!*title) {
+		xo_open_container("extra_status");
+		xo_emit("\t\tExtra status:\n");
+		*title = true;
+	}
+	va_start(args, fmt);
+	xo_emit_hv(NULL, fmt, args);
+	va_end(args);
+}
+
+static void
+print_extra_status(int eletype, u_char *cstat)
+{
+	bool title = false;
+
+	if (cstat[0] & 0x40) {
+		sesutil_print(&title, "\t\t-{e:predicted_failure/true} Predicted Failure\n");
+	}
+	if (cstat[0] & 0x20) {
+		sesutil_print(&title, "\t\t-{e:disabled/true} Disabled\n");
+	}
+	if (cstat[0] & 0x10) {
+		sesutil_print(&title, "\t\t-{e:swapped/true} Swapped\n");
+	}
+	switch (eletype) {
+	case ELMTYP_DEVICE:
+	case ELMTYP_ARRAY_DEV:
+		if (cstat[2] & 0x02) {
+			sesutil_print(&title, "\t\t- LED={q:led/locate}\n");
+		}
+		if (cstat[2] & 0x20) {
+			sesutil_print(&title, "\t\t- LED={q:led/fault}\n");
+		}
+		break;
+	case ELMTYP_FAN:
+		sesutil_print(&title, "\t\t- Speed: {:speed/%d}{Uw:rpm}\n",
+		    (((0x7 & cstat[1]) << 8) + cstat[2]) * 10);
+		break;
+	case ELMTYP_THERM:
+		if (cstat[2]) {
+			sesutil_print(&title, "\t\t- Temperature: {:temperature/%d}{Uw:C}\n",
+			    cstat[2] - TEMPERATURE_OFFSET);
+		} else {
+			sesutil_print(&title, "\t\t- Temperature: -{q:temperature/reserved}-\n");
+		}
+		break;
+	case ELMTYP_VOM:
+		sesutil_print(&title, "\t\t- Voltage: {:voltage/%.2f}{Uw:V}\n",
+		    be16dec(cstat + 2) / 100.0);
+		break;
+	}
+	if (title) {
+		xo_close_container("extra_status");
+	}
+}
+
 static int
 objmap(int argc, char **argv __unused)
 {
-	struct sbuf *extra;
 	encioc_string_t stri;
 	encioc_elm_devnames_t e_devname;
 	encioc_elm_status_t e_status;
@@ -325,8 +390,11 @@ objmap(int argc, char **argv __unused)
 	/* Get the list of ses devices */
 	if (glob(uflag, 0, NULL, &g) == GLOB_NOMATCH) {
 		globfree(&g);
-		errx(EXIT_FAILURE, "No SES devices found");
+		xo_errx(EXIT_FAILURE, "No SES devices found");
 	}
+	xo_set_version(SESUTIL_XO_VERSION);
+	xo_open_container("sesutil");
+	xo_open_list("enclosures");
 	for (i = 0; i < g.gl_pathc; i++) {
 		/* ensure we only got numbers after ses */
 		if (strspn(g.gl_pathv[i] + 8, "0123456789") !=
@@ -339,38 +407,40 @@ objmap(int argc, char **argv __unused)
 			 * accessing all devices
 			 */
 			if (errno == EACCES && g.gl_pathc > 1) {
-				err(EXIT_FAILURE, "unable to access SES device");
+				xo_err(EXIT_FAILURE, "unable to access SES device");
 			}
-			warn("unable to access SES device: %s", g.gl_pathv[i]);
+			xo_warn("unable to access SES device: %s", g.gl_pathv[i]);
 			continue;
 		}
 
 		if (ioctl(fd, ENCIOC_GETNELM, (caddr_t) &nobj) < 0) {
 			close(fd);
-			err(EXIT_FAILURE, "ENCIOC_GETNELM");
+			xo_err(EXIT_FAILURE, "ENCIOC_GETNELM");
 		}
 
 		e_ptr = calloc(nobj, sizeof(encioc_element_t));
 		if (e_ptr == NULL) {
 			close(fd);
-			err(EXIT_FAILURE, "calloc()");
+			xo_err(EXIT_FAILURE, "calloc()");
 		}
 
 		if (ioctl(fd, ENCIOC_GETELMMAP, (caddr_t) e_ptr) < 0) {
 			close(fd);
-			err(EXIT_FAILURE, "ENCIOC_GETELMMAP");
+			xo_err(EXIT_FAILURE, "ENCIOC_GETELMMAP");
 		}
 
-		printf("%s:\n", g.gl_pathv[i] + 5);
+		xo_open_instance("enclosures");
+		xo_emit("{t:enc/%s}:\n", g.gl_pathv[i] + 5);
 		stri.bufsiz = sizeof(str);
 		stri.buf = &str[0];
 		if (ioctl(fd, ENCIOC_GETENCNAME, (caddr_t) &stri) == 0)
-			printf("\tEnclosure Name: %s\n", stri.buf);
+			xo_emit("\tEnclosure Name: {t:name/%s}\n", stri.buf);
 		stri.bufsiz = sizeof(str);
 		stri.buf = &str[0];
 		if (ioctl(fd, ENCIOC_GETENCID, (caddr_t) &stri) == 0)
-			printf("\tEnclosure ID: %s\n", stri.buf);
+			xo_emit("\tEnclosure ID: {t:id/%s}\n", stri.buf);
 
+		xo_open_list("elements");
 		for (j = 0; j < nobj; j++) {
 			/* Get the status of the element */
 			memset(&e_status, 0, sizeof(e_status));
@@ -378,7 +448,7 @@ objmap(int argc, char **argv __unused)
 			if (ioctl(fd, ENCIOC_GETELMSTAT,
 			    (caddr_t) &e_status) < 0) {
 				close(fd);
-				err(EXIT_FAILURE, "ENCIOC_GETELMSTAT");
+				xo_err(EXIT_FAILURE, "ENCIOC_GETELMSTAT");
 			}
 			/* Get the description of the element */
 			memset(&e_desc, 0, sizeof(e_desc));
@@ -387,12 +457,12 @@ objmap(int argc, char **argv __unused)
 			e_desc.elm_desc_str = calloc(UINT16_MAX, sizeof(char));
 			if (e_desc.elm_desc_str == NULL) {
 				close(fd);
-				err(EXIT_FAILURE, "calloc()");
+				xo_err(EXIT_FAILURE, "calloc()");
 			}
 			if (ioctl(fd, ENCIOC_GETELMDESC,
 			    (caddr_t) &e_desc) < 0) {
 				close(fd);
-				err(EXIT_FAILURE, "ENCIOC_GETELMDESC");
+				xo_err(EXIT_FAILURE, "ENCIOC_GETELMDESC");
 			}
 			/* Get the device name(s) of the element */
 			memset(&e_devname, 0, sizeof(e_devname));
@@ -401,39 +471,40 @@ objmap(int argc, char **argv __unused)
 			e_devname.elm_devnames = calloc(128, sizeof(char));
 			if (e_devname.elm_devnames == NULL) {
 				close(fd);
-				err(EXIT_FAILURE, "calloc()");
+				xo_err(EXIT_FAILURE, "calloc()");
 			}
 			if (ioctl(fd, ENCIOC_GETELMDEVNAMES,
 			    (caddr_t) &e_devname) <0) {
 				/* We don't care if this fails */
 				e_devname.elm_devnames[0] = '\0';
 			}
-			printf("\tElement %u, Type: %s\n", e_ptr[j].elm_idx,
+			xo_open_instance("elements");
+			xo_emit("\tElement {:id/%u}, Type: {:type/%s}\n", e_ptr[j].elm_idx,
 			    geteltnm(e_ptr[j].elm_type));
-			printf("\t\tStatus: %s (0x%02x 0x%02x 0x%02x 0x%02x)\n",
+			xo_emit("\t\tStatus: {:status/%s} ({q:status_code/0x%02x 0x%02x 0x%02x 0x%02x})\n",
 			    scode2ascii(e_status.cstat[0]), e_status.cstat[0],
 			    e_status.cstat[1], e_status.cstat[2],
 			    e_status.cstat[3]);
 			if (e_desc.elm_desc_len > 0) {
-				printf("\t\tDescription: %s\n",
+				xo_emit("\t\tDescription: {:description/%s}\n",
 				    e_desc.elm_desc_str);
 			}
 			if (e_devname.elm_names_len > 0) {
-				printf("\t\tDevice Names: %s\n",
+				xo_emit("\t\tDevice Names: {:device_names/%s}\n",
 				    e_devname.elm_devnames);
 			}
-			extra = stat2sbuf(e_ptr[j].elm_type, e_status.cstat);
-			if (sbuf_len(extra) > 0) {
-				printf("\t\tExtra status:\n%s",
-				   sbuf_data(extra));
-			}
-			sbuf_delete(extra);
+			print_extra_status(e_ptr[j].elm_type, e_status.cstat);
+			xo_close_instance("elements");
 			free(e_devname.elm_devnames);
 		}
+		xo_close_list("elements");
 		free(e_ptr);
 		close(fd);
 	}
 	globfree(&g);
+	xo_close_list("enclosures");
+	xo_close_container("sesutil");
+	xo_finish();
 
 	return (EXIT_SUCCESS);
 }
@@ -454,8 +525,12 @@ encstatus(int argc, char **argv __unused)
 	/* Get the list of ses devices */
 	if (glob(uflag, 0, NULL, &g) == GLOB_NOMATCH) {
 		globfree(&g);
-		errx(EXIT_FAILURE, "No SES devices found");
+		xo_errx(EXIT_FAILURE, "No SES devices found");
 	}
+
+	xo_set_version(SESUTIL_XO_VERSION);
+	xo_open_container("sesutil");
+	xo_open_list("enclosures");
 	for (i = 0; i < g.gl_pathc; i++) {
 		/* ensure we only got numbers after ses */
 		if (strspn(g.gl_pathv[i] + 8, "0123456789") !=
@@ -468,56 +543,61 @@ encstatus(int argc, char **argv __unused)
 			 * accessing all devices
 			 */
 			if (errno == EACCES && g.gl_pathc > 1) {
-				err(EXIT_FAILURE, "unable to access SES device");
+				xo_err(EXIT_FAILURE, "unable to access SES device");
 			}
-			warn("unable to access SES device: %s", g.gl_pathv[i]);
+			xo_warn("unable to access SES device: %s", g.gl_pathv[i]);
 			continue;
 		}
 
 		if (ioctl(fd, ENCIOC_GETENCSTAT, (caddr_t) &estat) < 0) {
+			xo_err(EXIT_FAILURE, "ENCIOC_GETENCSTAT");
 			close(fd);
-			err(EXIT_FAILURE, "ENCIOC_GETENCSTAT");
 		}
 
-		printf("%s: ", g.gl_pathv[i] + 5);
+		xo_open_instance("enclosures");
+		xo_emit("{:enc/%s}: ", g.gl_pathv[i] + 5);
 		e = 0;
 		if (estat == 0) {
 			if (status == 0) {
 				status = 1;
 			}
-			printf("OK");
+			xo_emit("{q:status/OK}");
 		} else {
 			if (estat & SES_ENCSTAT_INFO) {
-				printf("INFO");
+				xo_emit("{lq:status/INFO}");
 				e++;
 			}
 			if (estat & SES_ENCSTAT_NONCRITICAL) {
 				if (e)
-					printf(",");
-				printf("NONCRITICAL");
+					xo_emit(",");
+				xo_emit("{lq:status/NONCRITICAL}");
 				e++;
 			}
 			if (estat & SES_ENCSTAT_CRITICAL) {
 				if (e)
-					printf(",");
-				printf("CRITICAL");
+					xo_emit(",");
+				xo_emit("{lq:status/CRITICAL}");
 				e++;
 				status = -1;
 			}
 			if (estat & SES_ENCSTAT_UNRECOV) {
 				if (e)
-					printf(",");
-				printf("UNRECOV");
+					xo_emit(",");
+				xo_emit("{lq:status/UNRECOV}");
 				e++;
 				status = -1;
 			}
 		}
-		printf("\n");
-
+		xo_close_instance("enclosures");
+		xo_emit("\n");
 		close(fd);
 	}
 	globfree(&g);
 
+	xo_close_list("enclosures");
+	xo_close_container("sesutil");
+	xo_finish();
+
 	if (status == 1) {
 		return (EXIT_SUCCESS);
 	} else {
@@ -531,6 +611,10 @@ main(int argc, char **argv)
 	int i, ch;
 	struct command *cmd = NULL;
 
+	argc = xo_parse_args(argc, argv);
+	if (argc < 0)
+		exit(1);
+
 	uflag = "/dev/ses[0-9]*";
 	while ((ch = getopt_long(argc, argv, "u:", NULL, NULL)) != -1) {
 		switch (ch) {