From a4f5b02ea26a04f5df89f1ed115374560e5f59dd Mon Sep 17 00:00:00 2001
From: marck <marck@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 5 Jul 2013 08:17:48 +0000
Subject: [PATCH] Finish MFC of r248291,249741:

Change 'status' command to produce one-line easy-parseable output.

Approved by:	trociny


git-svn-id: svn://svn.freebsd.org/base/stable/8@252777 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 UPDATING               |  4 ++++
 sbin/hastctl/hastctl.8 | 16 ++++------------
 sbin/hastctl/hastctl.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/UPDATING b/UPDATING
index f78dd05d0..cbae3f190 100644
--- a/UPDATING
+++ b/UPDATING
@@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V:
 	debugging tools present in HEAD were left in place because
 	sun4v support still needs work to become production ready.
 
+20130705:
+	hastctl(8)'s `status' command output changed to terse one-liner format.
+	Scripts using this should switch to `list' command or be rewritten.
+
 20130624:
 	Added ZFS TRIM support which is enabled by default. To disable
 	ZFS TRIM support set vfs.zfs.trim.enabled=0 in loader.conf.
diff --git a/sbin/hastctl/hastctl.8 b/sbin/hastctl/hastctl.8
index a457f2f3e..986230573 100644
--- a/sbin/hastctl/hastctl.8
+++ b/sbin/hastctl/hastctl.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 24, 2013
+.Dd July 5, 2013
 .Dt HASTCTL 8
 .Os
 .Sh NAME
@@ -145,18 +145,10 @@ GEOM provider
 will not be created on secondary node.
 .El
 .It Cm list
-.It Cm status
 Present verbose status of the configured resources.
-For now, list and status commands are equivalent.
-In the near future the output of 
-.Nm
-status command will change to more terse format.
-If you use `
-.Nm
-status' for parsing in your scripts, switch to `
-.Nm
-list'.
-
+.It Cm status
+Present terse (and more easy machine-parseable) status of the configured
+resources.
 .It Cm dump
 Dump metadata stored on local component for the configured resources.
 .El
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index f48c8cf7a..6fe55fa84 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -291,7 +291,7 @@ control_set_role(struct nv *nv, const char *newrole)
 }
 
 static int
-control_status(struct nv *nv)
+control_list(struct nv *nv)
 {
 	unsigned int ii;
 	const char *str;
@@ -355,6 +355,43 @@ control_status(struct nv *nv)
 	return (ret);
 }
 
+static int
+control_status(struct nv *nv)
+{
+	unsigned int ii;
+	const char *str;
+	int error, hprinted, ret;
+
+	hprinted = 0;
+	ret = 0;
+
+	for (ii = 0; ; ii++) {
+		str = nv_get_string(nv, "resource%u", ii);
+		if (str == NULL)
+			break;
+		if (!hprinted) {
+			printf("Name\tStatus\t Role\t\tComponents\n");
+			hprinted = 1;
+		}
+		printf("%s\t", str);
+		error = nv_get_int16(nv, "error%u", ii);
+		if (error != 0) {
+			if (ret == 0)
+				ret = error;
+			printf("ERR%d\n", error);
+			continue;
+		}
+		str = nv_get_string(nv, "status%u", ii);
+		printf("%-9s", (str != NULL) ? str : "-");
+		printf("%-15s", nv_get_string(nv, "role%u", ii));
+		printf("%s\t",
+		    nv_get_string(nv, "localpath%u", ii));
+		printf("%s\n",
+		    nv_get_string(nv, "remoteaddr%u", ii));
+	}
+	return (ret);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -523,6 +560,8 @@ main(int argc, char *argv[])
 		error = control_set_role(nv, argv[0]);
 		break;
 	case CMD_LIST:
+		error = control_list(nv);
+		break;
 	case CMD_STATUS:
 		error = control_status(nv);
 		break;
-- 
2.45.0