X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fstrings.c;h=b26691d3540f6999c1ec3cdfcdbfce934d91ec7b;hb=b6adf09c4d2cc3f1d0285950c151b1fd7688ec67;hp=5e9c3a8968cc5ad8a001f84cee77d3d531f303aa;hpb=fa7c8bb79b45aecdf65ed93635a42f3fdf301134;p=libguestfs.git

diff --git a/daemon/strings.c b/daemon/strings.c
index 5e9c3a8..b26691d 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -32,9 +32,7 @@ do_strings_e (const char *encoding, const char *path)
   char *buf;
   int r;
   char *out, *err;
-  char **lines = NULL;
-  int size = 0, alloc = 0;
-  char *p, *pend;
+  char **lines;
 
   NEED_ROOT (NULL);
   ABS_PATH (path, NULL);
@@ -60,25 +58,10 @@ do_strings_e (const char *encoding, const char *path)
   free (err);
 
   /* Now convert the output to a list of lines. */
-  p = out;
-  while (p && *p) {
-    pend = strchr (p, '\n');
-    if (pend) {
-      *pend = '\0';
-      pend++;
-    }
-
-    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. */