search for: do_du

...-1) { reply_with_error ("%s", err); free (out); diff --git a/daemon/du.c b/daemon/du.c index 62f1142..4392bef 100644 --- a/daemon/du.c +++ b/daemon/du.c @@ -28,6 +28,8 @@ #include "daemon.h" #include "actions.h" +GUESTFSD_EXT_CMD(str_du, du); + int64_t do_du (const char *path) { @@ -45,7 +47,7 @@ do_du (const char *path) pulse_mode_start (); - r = command (&out, &err, "du", "-s", buf, NULL); + r = command (&out, &err, str_du, "-s", buf, NULL); free (buf); if (r == -1) { pulse_mode_cance...

...= -1) { reply_with_error ("%s", err); free (out); diff --git a/daemon/du.c b/daemon/du.c index 62f1142..1aa3b52 100644 --- a/daemon/du.c +++ b/daemon/du.c @@ -28,6 +28,8 @@ #include "daemon.h" #include "actions.h" +GUESTFS_EXT_CMD(str_du, du); + int64_t do_du (const char *path) { @@ -45,7 +47,7 @@ do_du (const char *path) pulse_mode_start (); - r = command (&out, &err, "du", "-s", buf, NULL); + r = command (&out, &err, str_du, "-s", buf, NULL); free (buf); if (r == -1) { pulse_mode_cance...

...{ reply_with_error ("%s", err); free (out); diff --git a/daemon/du.c b/daemon/du.c index 5bb764075..7e6e329a3 100644 --- a/daemon/du.c +++ b/daemon/du.c @@ -28,8 +28,6 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_du, du); - int64_t do_du (const char *path) { @@ -46,7 +44,7 @@ do_du (const char *path) pulse_mode_start (); - r = command (&out, &err, str_du, "-s", buf, NULL); + r = command (&out, &err, "du", "-s", buf, NULL); if (r == -1) { pulse_mode_cancel (); repl...

...r); free (out); diff --git a/daemon/du.c b/daemon/du.c index 5bb764075..e4203f2dd 100644 --- a/daemon/du.c +++ b/daemon/du.c @@ -28,7 +28,7 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_du, du); +DECLARE_EXTERNAL_COMMANDS ("du") int64_t do_du (const char *path) @@ -46,7 +46,7 @@ do_du (const char *path) pulse_mode_start (); - r = command (&out, &err, str_du, "-s", buf, NULL); + r = command (&out, &err, "du", "-s", buf, NULL); if (r == -1) { pulse_mode_cancel (); reply_w...

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’