git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: udev-174 moves udevd to /lib/udev/udevd (instead of /sbin/udevd)
[libguestfs.git]
/
daemon
/
cmp.c
diff --git
a/daemon/cmp.c
b/daemon/cmp.c
index
04feba6
..
bbf9c74
100644
(file)
--- a/
daemon/cmp.c
+++ b/
daemon/cmp.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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,42
+28,32
@@
#include "actions.h"
int
#include "actions.h"
int
-do_equal (c
har *file1,
char *file2)
+do_equal (c
onst char *file1, const
char *file2)
{
char *file1buf, *file2buf;
{
char *file1buf, *file2buf;
- int file1len, file2len;
char *err;
int r;
char *err;
int r;
- NEED_ROOT (-1);
- ABS_PATH (file1, -1);
- ABS_PATH (file2, -1);
-
- file1len = strlen (file1) + 32;
- file1buf = malloc (file1len);
+ file1buf = sysroot_path (file1);
if (file1buf == NULL) {
reply_with_perror ("malloc");
return -1;
}
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;
}
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);
free (file2buf);
if (r == -1 || r > 1) {
r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL);
free (file1buf);
free (file2buf);
if (r == -1 || r > 1) {
- reply_with_error ("
cmp:
%s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
return -1;
}