From 3177b09272286bccc905d8cca61217cd12b2fa39 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Tue, 2 Dec 2003 21:42:20 +0000
Subject: [PATCH] Small fix for SDR csv output.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch separates the sensor reading and it's unit
(Volts, RPM etc.) into two columns.

This simplifies feeding the readings into other
utilities that expect pure numeric input.

From Fredrik Öhrn
---
 ipmitool/lib/ipmi_sdr.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c
index 2e24f7b..c0ac29b 100644
--- a/ipmitool/lib/ipmi_sdr.c
+++ b/ipmitool/lib/ipmi_sdr.c
@@ -476,8 +476,14 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 			}
 			printf("%s", sval);
 
-			if (do_unit && validread)
-				printf(" %s", unitstr);
+			if (validread) {
+				if (csv_output)
+					printf(",");
+				else
+					printf(" ");
+				if (do_unit)
+					printf("%s", unitstr);
+			}
 
 			if (csv_output)
 				printf(",");