search for: miniexpect

Currently you can only turn on miniexpect debugging by recompiling. These two patches make it configurable at runtime, and also improve the usefulness of the output. Rich.

Debugging can now be enabled at runtime. --- example-sshpass.c | 46 +++++++++++++++++++++++++------- miniexpect.c | 78 ++++++++++++++++++++++++++++++++++--------------------- miniexpect.h | 6 +++++ miniexpect.pod | 21 +++++++++++++++ 4 files changed, 113 insertions(+), 38 deletions(-) diff --git a/example-sshpass.c b/example-sshpass.c index 3449a20..11df02e 100644 --- a/example-sshpass.c ++...

--- miniexpect.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/miniexpect.c b/miniexpect.c index d5a7c6e..d2ceb69 100644 --- a/miniexpect.c +++ b/miniexpect.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stri...

...++ b/p2v/ssh.c @@ -392,6 +392,9 @@ start_ssh (unsigned spawn_flags, struct config *config, set_ssh_internal_error ("ssh: mexp_spawnvf: %m"); return NULL; } +#if DEBUG_STDERR + mexp_set_debug_file (h, stderr); +#endif /* We want the ssh ConnectTimeout to be less than the miniexpect * timeout, so that if the server is completely unresponsive we @@ -414,7 +417,8 @@ start_ssh (unsigned spawn_flags, struct config *config, { 0 } }, ovector, ovecsize)) { case 100: /* Got password prompt. */ - if (...

...to build. The split repository I have is: https://github.com/ptoscano/virt-p2v-split And follow here in this series all the patches to make virt-p2v build, work, and with also "make dist" usable. Let me know what you think -- any kind of feedback is welcome. Pino Toscano (5): Import miniexpect library Import gnulib Copy C sources from libguestfs Add/adapt all the files to build Improve gitignore .gitignore | 17 +- .gitmodules | 3 + .gnulib | 1 + AUTHORS | 16 + Makefile...

On Wednesday, 11 October 2017 17:23:45 CEST Richard W.M. Jones wrote: > +static int > +mexp_vprintf (mexp_h *h, int password, const char *fs, va_list args) > { > - va_list args; > char *msg; > int len; > size_t n; > ssize_t r; > char *p; > > - va_start (args, fs); > len = vasprintf (&msg, fs, args); > - va_end (args); Due to the

...| 1 + 13 files changed, 559 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d738d10f..8446d3af5 100644 --- a/.gitignore +++ b/.gitignore @@ -123,6 +123,7 @@ Makefile.in /common/errnostring/errnostring-gperf.gperf /common/errnostring/errnostring.h /common/miniexpect/miniexpect.3 +/common/mlaugeas/.depend /common/mlpcre/.depend /common/mlpcre/pcre_tests /common/mlprogress/.depend diff --git a/Makefile.am b/Makefile.am index e71328a58..e62f2678e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,6 +45,7 @@ SUBDIRS += lib docs examples po # The daemon and th...

...h session to virt-v2v. That is bad .. possibly (or maybe not). But in any case there is an alternative: we can send a ^C key to the virt-v2v process, which it could catch and handle gracefully, although it doesn't do that right now. Sending ^C turns out to be complex. It requires changes in miniexpect (http://git.annexia.org/?p=miniexpect.git;a=commitdiff;h=fb0eeddc671039cabd9c53934e324ae218b21000). Then we have to make sure the control connection to virt-v2v is opened in "cooked" mode. But we cannot open the control connection in cooked mode without also changing the way we are copyi...

...o Toscano (2): Remove virt-p2v Remove remaining virt-p2v bits .gitignore | 4 - Makefile.am | 7 +- bash/Makefile.am | 4 - bash/virt-alignment-scan | 18 - common/miniexpect/Makefile.am | 51 - common/miniexpect/README | 31 - common/miniexpect/miniexpect.c | 489 ---- common/miniexpect/miniexpect.h | 110 - common/miniexpect/miniexpect.pod | 496 ---- configure.ac...

See individual patches for details. Pino Toscano (4): Add valgrind suppression file podwrapper: the tools here start with p2v Import some internal documentation podwrapper: adapt footer to p2v .gitignore | 6 + Makefile.am | 4 +- configure.ac | 1 + docs/Makefile.am | 65 ++++++++ docs/p2v-building.pod | 259

...- generator/Makefile.am | 2 +- m4/guestfs_ocaml.m4 | 14 +++++--------- mllib/Makefile.am | 1 - 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 23cefcb..bbd9284 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ Makefile.in /common/miniexpect/miniexpect.3 /common/mlprogress/.depend /common/mlstdutils/.depend +/common/mlstdutils/bytes.ml /common/mlstdutils/guestfs_config.ml /common/mlstdutils/libdir.ml /common/mlstdutils/oUnit-* @@ -275,7 +276,6 @@ Makefile.in /fuse/test-guestmount-fd /fuse/test-guestunmount-fd /generator/.depend...

...++++++++++++++++++++++ po/POTFILES | 1 + 7 files changed, 160 insertions(+), 4 deletions(-) create mode 100644 p2v/whole-file.c diff --git a/p2v/Makefile.am b/p2v/Makefile.am index 0fd9ef5..2401a07 100644 --- a/p2v/Makefile.am +++ b/p2v/Makefile.am @@ -60,7 +60,8 @@ virt_p2v_SOURCES = \ miniexpect.h \ p2v.h \ ssh.c \ - utils.c + utils.c \ + whole-file.c virt_p2v_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ diff --git a/p2v/conversion.c b/p2v/conversion.c index e2f37cd..f781921 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -37,6 +37,8 @@ #in...

...n localhost where the sudo message could be read in a single call to read(2) without seeing the prompt immediately afterwards. Even this exception was non-deterministic.) By swapping the priority of the sudo message and prompt we avoid this. Looking at the debug output (enabled by editing common/miniexpect) makes this clearer: DEBUG: writing: sudo -n virt-v2v --version DEBUG: buffer content: sudo: a password is required ESC]0;rjones@hamr:~^G###bphcxtq5### Thanks: Ming Xie. --- p2v/ssh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/p2v/ssh.c b/p2v/ssh.c ind...

Followup/fix of commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f

v2: - Change the OCaml code in the daemon to use PCRE instead of Str. - Call pcre_compile2 so we can capture the error code on failure. - Extend the test suite. - Some other cleanups, but very minor. 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: -

Fix and/or document issues raised in this thread: https://www.redhat.com/archives/libguestfs/2017-February/msg00010.html Rich.

It is no more needed, guestfs-utils.h is enough these days. --- p2v/p2v.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/p2v/p2v.h b/p2v/p2v.h index 2447cf05e..66c245eda 100644 --- a/p2v/p2v.h +++ b/p2v/p2v.h @@ -30,17 +30,8 @@ #include "miniexpect.h" #include "p2v-config.h" -/* We don't use libguestfs directly here, and we don't link to it - * either (in fact, we don't want libguestfs on the ISO). However - * we include this just so that we can use the convenience macros in - * utils.h. - */ -#include "gue...

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.

.../' | \ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \ diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES index fce01da3e..e856ffda0 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -21,6 +21,9 @@ common/miniexpect/miniexpect.c common/miniexpect/miniexpect.h common/mlprogress/progress-c.c common/mlstdutils/dummy.c +common/mlutils/c_utils-c.c +common/mlutils/dummy.c +common/mlutils/unix_utils-c.c common/mlvisit/dummy.c common/mlvisit/visit-c.c common/mlxml/xml-c.c @@ -344,7 +347,6 @@ make-fs/make-fs.c m...