git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guestfs-testing: Link to libguestfs-test-tool.
[libguestfs.git]
/
daemon
/
cmp.c
diff --git
a/daemon/cmp.c
b/daemon/cmp.c
index
a48e924
..
0673403
100644
(file)
--- a/
daemon/cmp.c
+++ b/
daemon/cmp.c
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-28,16
+28,12
@@
#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 *err;
int r;
{
char *file1buf, *file2buf;
char *err;
int r;
- NEED_ROOT (return -1);
- ABS_PATH (file1, return -1);
- ABS_PATH (file2, return -1);
-
file1buf = sysroot_path (file1);
if (file1buf == NULL) {
reply_with_perror ("malloc");
file1buf = sysroot_path (file1);
if (file1buf == NULL) {
reply_with_perror ("malloc");
@@
-57,7
+53,7
@@
do_equal (char *file1, char *file2)
free (file2buf);
if (r == -1 || r > 1) {
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;
}