From: Richard Jones <rjones@redhat.com>
Date: Wed, 8 Apr 2009 14:08:10 +0000 (+0100)
Subject: Bug fix: Trailing whitespace from 'pvs' command.
X-Git-Tag: 0.5~2
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=447b96e57cdf40ddc3b7669ba65dbea961748f71;p=libguestfs.git

Bug fix: Trailing whitespace from 'pvs' command.
---

diff --git a/daemon/lvm.c b/daemon/lvm.c
index bc38547..7f31c84 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -37,6 +37,7 @@ convert_lvm_output (char *out, char *prefix)
   char *p, *pend;
   char **r = NULL;
   int size = 0, alloc = 0;
+  int len;
   char buf[256];
   char *str;
 
@@ -51,6 +52,11 @@ convert_lvm_output (char *out, char *prefix)
     while (*p && isspace (*p))	/* Skip any leading whitespace. */
       p++;
 
+    /* Sigh, skip trailing whitespace too.  "pvs", I'm looking at you. */
+    len = strlen (p)-1;
+    while (*p && isspace (p[len]))
+      p[len--] = '\0';
+
     if (!*p) {			/* Empty line?  Skip it. */
       p = pend;
       continue;