From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 10 Sep 2011 10:25:04 +0000 (+0200)
Subject: lscpu: s/Y/Yes/ s/N/No/
X-Git-Tag: v2.21-rc1~432
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e43fc13e7675445a76305e4f5e52352b3fc2203a;p=thirdparty%2Futil-linux.git

lscpu: s/Y/Yes/ s/N/No/

However I'd like to see one change if you don't object: printing just "N" or
"Y" instead of "No" and "Yes" in the human readable output looks a bit ugly to
me.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 601c8729c8..6a37bb3b81 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -995,13 +995,24 @@ get_cell_data(struct lscpu_desc *desc, int cpu, int col,
 			snprintf(buf, bufsz, "%d", desc->addresses[cpu]);
 		break;
 	case COL_CONFIGURED:
-		if (desc->configured)
+		if (!desc->configured)
+			break;
+		if (mod->mode == OUTPUT_PARSABLE)
 			snprintf(buf, bufsz,
 				 desc->configured[cpu] ? _("Y") : _("N"));
+		else
+			snprintf(buf, bufsz,
+				 desc->configured[cpu] ? _("Yes") : _("No"));
 		break;
 	case COL_ONLINE:
-		if (desc->online)
-			snprintf(buf, bufsz, is_cpu_online(desc, cpu) ? _("Y") : _("N"));
+		if (!desc->online)
+			break;
+		if (mod->mode == OUTPUT_PARSABLE)
+			snprintf(buf, bufsz,
+				 is_cpu_online(desc, cpu) ? _("Y") : _("N"));
+		else
+			snprintf(buf, bufsz,
+				 is_cpu_online(desc, cpu) ? _("Yes") : _("No"));
 		break;
 	}
 	return buf;