* src/generator.ml: Change all `String "device"' to `Device "device"'.

[libguestfs.git] / daemon / strings.c

diff --git a/daemon/strings.c b/daemon/strings.c
index d78f9fd..89e04a8 100644 (file)
--- 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
@@ -28,24 +28,20 @@
 char **
 do_strings_e (char *encoding, char *path)
 {
-  int len;
   char *buf;
   int r;
   char *out, *err;
   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) {