X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcommand.c;h=1a50264b3c4c100b6d0c6f467ccc3e06a4c5faa1;hp=1daccf6efd8937dc97e15868f5d253ff202897fa;hb=f6e36bf361c587e0dbb2f0c71f5d22a7cf7f4f42;hpb=296b536c965820b8334150df0247a0657f6e35fd

diff --git a/daemon/command.c b/daemon/command.c
index 1daccf6..1a50264 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -84,37 +84,16 @@ char **
 do_command_lines (char * const * const argv)
 {
   char *out;
-  char **lines = NULL;
-  int size = 0, alloc = 0;
-  char *p, *pend;
+  char **lines;
 
   out = do_command (argv);
   if (out == NULL)
     return NULL;
 
-  /* Now convert the output to a list of lines. */
-  p = out;
-  while (p) {
-    pend = strchr (p, '\n');
-    if (pend) {
-      *pend = '\0';
-      pend++;
-
-      /* Final \n?  Don't return an empty final element. */
-      if (*pend == '\0') break;
-    }
-
-    if (add_string (&lines, &size, &alloc, p) == -1) {
-      free (out);
-      return NULL;
-    }
-
-    p = pend;
-  }
-
+  lines = split_lines (out);
   free (out);
 
-  if (add_string (&lines, &size, &alloc, NULL) == -1)
+  if (lines == NULL)
     return NULL;
 
   return lines;			/* Caller frees. */