X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcmp.c;h=56717c55cb5379505f834ad80502d9a9818fccfb;hp=04feba6d3aa95d2cfe0f28a1b6c7d117ba8805c4;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=887290e949d54c6ac4c9b787231e588f84f2367c

diff --git a/daemon/cmp.c b/daemon/cmp.c
index 04feba6..56717c5 100644
--- a/daemon/cmp.c
+++ b/daemon/cmp.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,35 +28,29 @@
 #include "actions.h"
 
 int
-do_equal (char *file1, char *file2)
+do_equal (const char *file1, const char *file2)
 {
   char *file1buf, *file2buf;
-  int file1len, file2len;
   char *err;
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (file1, -1);
-  ABS_PATH (file2, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (file1, return -1);
+  ABS_PATH (file2, return -1);
 
-  file1len = strlen (file1) + 32;
-  file1buf = malloc (file1len);
+  file1buf = sysroot_path (file1);
   if (file1buf == NULL) {
     reply_with_perror ("malloc");
     return -1;
   }
 
-  file2len = strlen (file2) + 32;
-  file2buf = malloc (file2len);
+  file2buf = sysroot_path (file2);
   if (file2buf == NULL) {
     reply_with_perror ("malloc");
     free (file1buf);
     return -1;
   }
 
-  snprintf (file1buf, file1len, "/sysroot%s", file1);
-  snprintf (file2buf, file2len, "/sysroot%s", file2);
-
   r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL);
 
   free (file1buf);