From: Karel Zak <kzak@redhat.com>
Date: Thu, 23 Oct 2014 12:43:31 +0000 (+0200)
Subject: blkid: remove extra trailing spaces in output
X-Git-Tag: v2.26-rc1~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16714abef2087ee324d8773c0d83def2ec95e5e3;p=thirdparty%2Futil-linux.git

blkid: remove extra trailing spaces in output

$  blkid | egrep -i 'sda.*label' | cat -A
/dev/sda2: UUID="8382f307-fb43-489f-ab38-8d4cf37ca88c" SEC_TYPE="ext2" TYPE="ext3" LABEL="test" $
/dev/sda5: UUID="0b46d673-8c23-4709-b92c-3fdf460e1dd4" TYPE="ext3" LABEL="rescue" SEC_TYPE="ext2" $
/dev/sda6: UUID="cb9d814f-d885-435b-8e6d-ac17c0ac5aa1" TYPE="ext3" LABEL="root" $
/dev/sda8: UUID="1e2851bd-cc6f-4d72-bf9f-c6fa754155b1" TYPE="ext3" LABEL="data" SEC_TYPE="ext2" $
/dev/sda9: UUID="d16a2f42-9a50-4489-a788-8624c832a7f3" TYPE="ext3" LABEL="storage" SEC_TYPE="ext2" $
/dev/sda7: TYPE="swap" LABEL="swap" UUID="8393acfa-d4bd-40fc-8eb9-5ccd8d85e103" $

Addresses: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586179
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index b3eade56b4..a6ca660c65 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -311,11 +311,12 @@ static void print_value(int output, int num, const char *devname,
 
 	} else {
 		if (num == 1 && devname)
-			printf("%s: ", devname);
+			printf("%s:", devname);
+		fputs(" ", stdout);
 		fputs(name, stdout);
 		fputs("=\"", stdout);
 		safe_print(value, valsz, "\"");
-		fputs("\" ", stdout);
+		fputs("\"", stdout);
 	}
 }