search for: file1buf

...uot;daemon.h" #include "actions.h" +GUESTFSD_EXT_CMD(str_cmp, cmp); + int do_equal (const char *file1, const char *file2) { @@ -47,7 +49,7 @@ do_equal (const char *file1, const char *file2) return -1; } - r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL); + r = commandr (NULL, &err, str_cmp, "-s", file1buf, file2buf, NULL); free (file1buf); free (file2buf); diff --git a/daemon/command.c b/daemon/command.c index 7c67d83..5839033 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -28,10 +28,13 @@ #inclu...

...quot;daemon.h" #include "actions.h" +GUESTFS_EXT_CMD(str_cmp, cmp); + int do_equal (const char *file1, const char *file2) { @@ -47,7 +49,7 @@ do_equal (const char *file1, const char *file2) return -1; } - r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL); + r = commandr (NULL, &err, str_cmp, "-s", file1buf, file2buf, NULL); free (file1buf); free (file2buf); diff --git a/daemon/command.c b/daemon/command.c index 7c67d83..4ab2432 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -28,10 +28,13 @@ #inclu...

...clude "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_cmp, cmp); - int do_equal (const char *file1, const char *file2) { @@ -48,7 +46,7 @@ do_equal (const char *file1, const char *file2) return -1; } - r = commandr (NULL, &err, str_cmp, "-s", file1buf, file2buf, NULL); + r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL); if (r == -1 || r > 1) { reply_with_error ("%s", err); return -1; diff --git a/daemon/compress.c b/daemon/compress.c index 36f4e66f7..75eaae0c7 100644 --- a/daemon...

...;actions.h" -GUESTFSD_EXT_CMD(str_cmp, cmp); +DECLARE_EXTERNAL_COMMANDS ("cmp") int do_equal (const char *file1, const char *file2) @@ -48,7 +48,7 @@ do_equal (const char *file1, const char *file2) return -1; } - r = commandr (NULL, &err, str_cmp, "-s", file1buf, file2buf, NULL); + r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL); if (r == -1 || r > 1) { reply_with_error ("%s", err); return -1; diff --git a/daemon/compress.c b/daemon/compress.c index 36f4e66f7..ca8678965 100644 --- a/daemon...

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’