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

diff --git a/daemon/strings.c b/daemon/strings.c
index 5e9c3a8..89e04a8 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,28 +26,22 @@
 #include "actions.h"
 
 char **
-do_strings_e (const char *encoding, const char *path)
+do_strings_e (char *encoding, char *path)
 {
-  int len;
   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);
+  ABS_PATH (path, return NULL);
 
-  len = strlen (path) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
     return NULL;
   }
 
-  snprintf (buf, len, "/sysroot%s", path);
-
   r = command (&out, &err, "strings", "-e", encoding, buf, NULL);
   free (buf);
   if (r == -1) {
@@ -60,32 +54,17 @@ 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. */
 }
 
 char **
-do_strings (const char *path)
+do_strings (char *path)
 {
   return do_strings_e ("s", path);
 }