search for: do_echo_daemon

...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. + */ + +#include <config.h> + +#include <string.h> + +#include "actions.h" + +char * +do_echo_daemon (char *const *argv) +{ + char *out = NULL; + size_t out_len = 0; + + /* Iterate over argv entries until reaching the NULL terminator */ + while (*argv) { + char add_space = 0; + + /* Store the end of current output */ + size_t out_end = out_len; + + /* Calculate the new output size...

...g as return value. --- daemon/echo-daemon.c | 8 ++++++++ generator/actions.ml | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/daemon/echo-daemon.c b/daemon/echo-daemon.c index c805819..d8f1028 100644 --- a/daemon/echo-daemon.c +++ b/daemon/echo-daemon.c @@ -65,6 +65,14 @@ do_echo_daemon (char *const *argv) argv++; } + if (NULL == out) { + /* No strings, so create a new empty array. */ + out = malloc (sizeof (char *)); + if (NULL == out) { + reply_with_perror ("malloc"); + return NULL; + } + } /* NULL terminate the output */ out[o...

...trings (argv); + const size_t len = guestfs_int_count_strings (argv); CLEANUP_FREE const char **cargv = NULL; size_t i; int r; diff --git a/daemon/echo-daemon.c b/daemon/echo-daemon.c index d566a9bb2..15429f072 100644 --- a/daemon/echo-daemon.c +++ b/daemon/echo-daemon.c @@ -28,7 +28,7 @@ do_echo_daemon (char *const *argv) { char *out; - out = join_strings (" ", argv); + out = guestfs_int_join_strings (" ", argv); if (out == NULL) { reply_with_perror ("malloc"); return NULL; diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index db2bb702f..b3f40...

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid