1 files changed, 5 insertions, 0 deletions
diff --git a/src/events.c b/src/events.c
index aa097295..a82b3f63 100644
--- a/src/events.c
+++ b/src/events.c
@@ -161,6 +161,11 @@ guestfs___call_callbacks_message (guestfs_h *g, uint64_t event,
         while (i < buf_len && NO_ESCAPING (buf[i]))
           ++i;
         fwrite (&buf[i0], 1, i-i0, stderr);
+        /* Adjust i so that next time around the loop, the next
+         * non-printing character will be displayed.
+         */
+        if (i < buf_len)
+          --i;
       } else {
         switch (buf[i]) {
         case '\0': fputs ("\\0", stderr); break;