]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
blkid: remove extra trailing spaces in output
authorKarel Zak <kzak@redhat.com>
Thu, 23 Oct 2014 12:43:31 +0000 (14:43 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 23 Oct 2014 12:43:31 +0000 (14:43 +0200)
$  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>
misc-utils/blkid.c

index b3eade56b445d33d30b4c551571b6331f74dc8e8..a6ca660c6573c7fb6471b2cd16b3e6efc3a1edfa 100644 (file)
@@ -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);
        }
 }