search for: commandrv

...://et.redhat.com/~rjones/virt-df/ -------------- next part -------------- >From 34ba249f8c9e3478cbff5a24ba958865106819a4 Mon Sep 17 00:00:00 2001 From: Richard Jones <rjones at redhat.com> Date: Sun, 8 Nov 2009 11:55:38 +0000 Subject: [PATCH] Fix prototype of commandv to match prototype of commandrv. --- daemon/blockdev.c | 2 +- daemon/command.c | 2 +- daemon/daemon.h | 2 +- daemon/guestfsd.c | 5 +++-- daemon/lvm.c | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/daemon/blockdev.c b/daemon/blockdev.c index 1aa6eaa..4d3c2ab 100644 --- a/daemo...

The warnings in daemon were aggravating and risky for development (too easy to miss new ones) so I spent some time last week and today working on removing them. The first patch gets us down to almost no warnings with the original -Wall setting. That was by far the hardest part. Once I'd done that, I enabled nearly all of gcc's warnings via gnulib's warnings and manywarnings modules

...; > + > + r = commandv (NULL, &err, argv); > + if (r == -1) { > + reply_with_error ("udevadm command failed: %s", err); IMHO reply_with_error is not correct here -- so far a failure to run udevadm is not fatal at all, so it should be kept that way. Also most probably commandrv, so we can still - show perror when udevadm could not be run (return code = -1) - show the warning when udevadm failed to run (exit code != 0) The rest of the changes looks good. Thanks, -- Pino Toscano

...xtern const char *sysroot; +extern size_t sysroot_len; + +#ifndef MAX +# define MAX(a,b) ((a)>(b)?(a):(b)) +#endif + +/* For improved readability dealing with pipe arrays */ +#define PIPE_READ 0 +#define PIPE_WRITE 1 + +/* Easy ways to run external commands. For full documentation, see + * 'commandrvf' below. + */ +int +commandf (char **stdoutput, char **stderror, unsigned flags, + const char *name, ...) +{ + va_list args; + /* NB: Mustn't free the strings which are on the stack. */ + CLEANUP_FREE const char **argv = NULL; + char *s; + size_t i; + int r; + + /* Collect t...

..._cmd (str_mv, NULL, src, dest); } static int diff --git a/daemon/daemon.h b/daemon/daemon.h index d17dcbd..a483208 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -96,6 +96,9 @@ extern char **split_lines (char *str); #define commandv(out,err,argv) commandvf((out),(err),0,(argv)) #define commandrv(out,err,argv) commandrvf((out),(err),0,(argv)) +#define __external_command __attribute__((__section__(".guestfsd_ext_cmds"))) +#define GUESTFSD_EXT_CMD(___ext_cmd_var, ___ext_cmd_str) static const char ___ext_cmd_var[] __external_command = #___ext_cmd_str + #define COMMAND_FLAG_FD_MASK...

..._cmd (str_mv, NULL, src, dest); } static int diff --git a/daemon/daemon.h b/daemon/daemon.h index bbe77f9..f848914 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -96,6 +96,9 @@ extern char **split_lines (char *str); #define commandv(out,err,argv) commandvf((out),(err),0,(argv)) #define commandrv(out,err,argv) commandrvf((out),(err),0,(argv)) +#define __external_command __attribute__((__section__(".guestfs_ext_cmds"))) +#define GUESTFS_EXT_CMD(___ext_cmd_var, ___ext_cmd_str) static const char ___ext_cmd_var[] __external_command = #___ext_cmd_str + #define COMMAND_FLAG_FD_MASK...

This is a more working version. Inspection (partially) succeeds on a real guest this time :-) You can test it out on a real guest (in this case, a CentOS disk image located at /tmp/centos-6.img) by doing: $ ./run guestfish -v -x -a /tmp/centos-6.img ><fs> run ><fs> debug sh "guestfs-inspection --verbose" which will print lots of debugging, and at the end the

For background on this change, see: https://rwmj.wordpress.com/2015/12/06/inspection-now-with-added-prolog/ v2 was previously posted here: https://www.redhat.com/archives/libguestfs/2015-December/msg00038.html To test this patch series on a real guest, you can do: $ ./run guestfish -v -x -a /var/tmp/centos-6.img ><fs> run ><fs> debug sh "guestfs-inspection

...mmand (char **stdoutput, char **stderror, const char *name, ...); extern int commandr (char **stdoutput, char **stderror, const char *name, ...); extern int commandv (char **stdoutput, char **stderror, - char * const* const argv); + char * const* const argv); extern int commandrv (char **stdoutput, char **stderror, - char * const* const argv); + char * const* const argv); extern char **split_lines (char *str); diff --git a/daemon/debug.c b/daemon/debug.c index 68320a3..13b7240 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -157,11 +157,11...