Generated code to support previous 2 commits.

5 files changed, 433 insertions, 1 deletions

diff --git a/src/guestfs-actions.c b/src/guestfs-actions.c
index 3da1b42b..f49e79f9 100644
--- a/src/guestfs-actions.c
+++ b/src/guestfs-actions.c
@@ -8428,3 +8428,288 @@ int guestfs_equal (guestfs_h *g,
   return ctx.ret.equality;
 }
 
+struct strings_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_strings_ret ret;
+};
+
+static void strings_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct strings_ctx *ctx = (struct strings_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_strings");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_strings");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_strings");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_strings_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_strings");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_strings (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_strings_args args;
+  struct strings_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_strings") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STRINGS,
+        (xdrproc_t) xdr_guestfs_strings_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, strings_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_strings");
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STRINGS, serial) == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs_set_ready (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.stringsout.stringsout_val =
+    safe_realloc (g, ctx.ret.stringsout.stringsout_val,
+                  sizeof (char *) * (ctx.ret.stringsout.stringsout_len + 1));
+  ctx.ret.stringsout.stringsout_val[ctx.ret.stringsout.stringsout_len] = NULL;
+  return ctx.ret.stringsout.stringsout_val;
+}
+
+struct strings_e_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_strings_e_ret ret;
+};
+
+static void strings_e_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct strings_e_ctx *ctx = (struct strings_e_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_strings_e");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_strings_e");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_strings_e");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_strings_e_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_strings_e");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char **guestfs_strings_e (guestfs_h *g,
+		const char *encoding,
+		const char *path)
+{
+  struct guestfs_strings_e_args args;
+  struct strings_e_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_strings_e") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.encoding = (char *) encoding;
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_STRINGS_E,
+        (xdrproc_t) xdr_guestfs_strings_e_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, strings_e_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_strings_e");
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_STRINGS_E, serial) == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs_set_ready (g);
+  /* caller will free this, but we need to add a NULL entry */
+  ctx.ret.stringsout.stringsout_val =
+    safe_realloc (g, ctx.ret.stringsout.stringsout_val,
+                  sizeof (char *) * (ctx.ret.stringsout.stringsout_len + 1));
+  ctx.ret.stringsout.stringsout_val[ctx.ret.stringsout.stringsout_len] = NULL;
+  return ctx.ret.stringsout.stringsout_val;
+}
+
+struct hexdump_ctx {
+  /* This flag is set by the callbacks, so we know we've done
+   * the callbacks as expected, and in the right sequence.
+   * 0 = not called, 1 = reply_cb called.
+   */
+  int cb_sequence;
+  struct guestfs_message_header hdr;
+  struct guestfs_message_error err;
+  struct guestfs_hexdump_ret ret;
+};
+
+static void hexdump_reply_cb (guestfs_h *g, void *data, XDR *xdr)
+{
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  struct hexdump_ctx *ctx = (struct hexdump_ctx *) data;
+
+  /* This should definitely not happen. */
+  if (ctx->cb_sequence != 0) {
+    ctx->cb_sequence = 9999;
+    error (g, "%s: internal error: reply callback called twice", "guestfs_hexdump");
+    return;
+  }
+
+  ml->main_loop_quit (ml, g);
+
+  if (!xdr_guestfs_message_header (xdr, &ctx->hdr)) {
+    error (g, "%s: failed to parse reply header", "guestfs_hexdump");
+    return;
+  }
+  if (ctx->hdr.status == GUESTFS_STATUS_ERROR) {
+    if (!xdr_guestfs_message_error (xdr, &ctx->err)) {
+      error (g, "%s: failed to parse reply error", "guestfs_hexdump");
+      return;
+    }
+    goto done;
+  }
+  if (!xdr_guestfs_hexdump_ret (xdr, &ctx->ret)) {
+    error (g, "%s: failed to parse reply", "guestfs_hexdump");
+    return;
+  }
+ done:
+  ctx->cb_sequence = 1;
+}
+
+char *guestfs_hexdump (guestfs_h *g,
+		const char *path)
+{
+  struct guestfs_hexdump_args args;
+  struct hexdump_ctx ctx;
+  guestfs_main_loop *ml = guestfs_get_main_loop (g);
+  int serial;
+
+  if (check_state (g, "guestfs_hexdump") == -1) return NULL;
+  guestfs_set_busy (g);
+
+  memset (&ctx, 0, sizeof ctx);
+
+  args.path = (char *) path;
+  serial = guestfs__send_sync (g, GUESTFS_PROC_HEXDUMP,
+        (xdrproc_t) xdr_guestfs_hexdump_args, (char *) &args);
+  if (serial == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs__switch_to_receiving (g);
+  ctx.cb_sequence = 0;
+  guestfs_set_reply_callback (g, hexdump_reply_cb, &ctx);
+  (void) ml->main_loop_run (ml, g);
+  guestfs_set_reply_callback (g, NULL, NULL);
+  if (ctx.cb_sequence != 1) {
+    error (g, "%s reply failed, see earlier error messages", "guestfs_hexdump");
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (check_reply_header (g, &ctx.hdr, GUESTFS_PROC_HEXDUMP, serial) == -1) {
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  if (ctx.hdr.status == GUESTFS_STATUS_ERROR) {
+    error (g, "%s", ctx.err.error_message);
+    guestfs_set_ready (g);
+    return NULL;
+  }
+
+  guestfs_set_ready (g);
+  return ctx.ret.dump; /* caller will free */
+}
+
diff --git a/src/guestfs-actions.h b/src/guestfs-actions.h
index 05399818..12b33d67 100644
--- a/src/guestfs-actions.h
+++ b/src/guestfs-actions.h
@@ -133,3 +133,6 @@ extern int guestfs_drop_caches (guestfs_h *handle, int whattodrop);
 extern char *guestfs_dmesg (guestfs_h *handle);
 extern int guestfs_ping_daemon (guestfs_h *handle);
 extern int guestfs_equal (guestfs_h *handle, const char *file1, const char *file2);
+extern char **guestfs_strings (guestfs_h *handle, const char *path);
+extern char **guestfs_strings_e (guestfs_h *handle, const char *encoding, const char *path);
+extern char *guestfs_hexdump (guestfs_h *handle, const char *path);
diff --git a/src/guestfs_protocol.c b/src/guestfs_protocol.c
index 66889cc4..d53bcffc 100644
--- a/src/guestfs_protocol.c
+++ b/src/guestfs_protocol.c
@@ -1550,6 +1550,70 @@ xdr_guestfs_equal_ret (XDR *xdrs, guestfs_equal_ret *objp)
 }
 
 bool_t
+xdr_guestfs_strings_args (XDR *xdrs, guestfs_strings_args *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, &objp->path, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_guestfs_strings_ret (XDR *xdrs, guestfs_strings_ret *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_array (xdrs, (char **)&objp->stringsout.stringsout_val, (u_int *) &objp->stringsout.stringsout_len, ~0,
+		sizeof (str), (xdrproc_t) xdr_str))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_guestfs_strings_e_args (XDR *xdrs, guestfs_strings_e_args *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, &objp->encoding, ~0))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->path, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_guestfs_strings_e_ret (XDR *xdrs, guestfs_strings_e_ret *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_array (xdrs, (char **)&objp->stringsout.stringsout_val, (u_int *) &objp->stringsout.stringsout_len, ~0,
+		sizeof (str), (xdrproc_t) xdr_str))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_guestfs_hexdump_args (XDR *xdrs, guestfs_hexdump_args *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, &objp->path, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
+xdr_guestfs_hexdump_ret (XDR *xdrs, guestfs_hexdump_ret *objp)
+{
+	register int32_t *buf;
+
+	 if (!xdr_string (xdrs, &objp->dump, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_t
 xdr_guestfs_procedure (XDR *xdrs, guestfs_procedure *objp)
 {
 	register int32_t *buf;
diff --git a/src/guestfs_protocol.h b/src/guestfs_protocol.h
index 06287c9e..87db39b3 100644
--- a/src/guestfs_protocol.h
+++ b/src/guestfs_protocol.h
@@ -800,6 +800,43 @@ struct guestfs_equal_ret {
 };
 typedef struct guestfs_equal_ret guestfs_equal_ret;
 
+struct guestfs_strings_args {
+	char *path;
+};
+typedef struct guestfs_strings_args guestfs_strings_args;
+
+struct guestfs_strings_ret {
+	struct {
+		u_int stringsout_len;
+		str *stringsout_val;
+	} stringsout;
+};
+typedef struct guestfs_strings_ret guestfs_strings_ret;
+
+struct guestfs_strings_e_args {
+	char *encoding;
+	char *path;
+};
+typedef struct guestfs_strings_e_args guestfs_strings_e_args;
+
+struct guestfs_strings_e_ret {
+	struct {
+		u_int stringsout_len;
+		str *stringsout_val;
+	} stringsout;
+};
+typedef struct guestfs_strings_e_ret guestfs_strings_e_ret;
+
+struct guestfs_hexdump_args {
+	char *path;
+};
+typedef struct guestfs_hexdump_args guestfs_hexdump_args;
+
+struct guestfs_hexdump_ret {
+	char *dump;
+};
+typedef struct guestfs_hexdump_ret guestfs_hexdump_ret;
+
 enum guestfs_procedure {
 	GUESTFS_PROC_MOUNT = 1,
 	GUESTFS_PROC_SYNC = 2,
@@ -894,7 +931,10 @@ enum guestfs_procedure {
 	GUESTFS_PROC_DMESG = 91,
 	GUESTFS_PROC_PING_DAEMON = 92,
 	GUESTFS_PROC_EQUAL = 93,
-	GUESTFS_PROC_NR_PROCS = 93 + 1,
+	GUESTFS_PROC_STRINGS = 94,
+	GUESTFS_PROC_STRINGS_E = 95,
+	GUESTFS_PROC_HEXDUMP = 96,
+	GUESTFS_PROC_NR_PROCS = 96 + 1,
 };
 typedef enum guestfs_procedure guestfs_procedure;
 #define GUESTFS_MESSAGE_MAX 4194304
@@ -1070,6 +1110,12 @@ extern  bool_t xdr_guestfs_drop_caches_args (XDR *, guestfs_drop_caches_args*);
 extern  bool_t xdr_guestfs_dmesg_ret (XDR *, guestfs_dmesg_ret*);
 extern  bool_t xdr_guestfs_equal_args (XDR *, guestfs_equal_args*);
 extern  bool_t xdr_guestfs_equal_ret (XDR *, guestfs_equal_ret*);
+extern  bool_t xdr_guestfs_strings_args (XDR *, guestfs_strings_args*);
+extern  bool_t xdr_guestfs_strings_ret (XDR *, guestfs_strings_ret*);
+extern  bool_t xdr_guestfs_strings_e_args (XDR *, guestfs_strings_e_args*);
+extern  bool_t xdr_guestfs_strings_e_ret (XDR *, guestfs_strings_e_ret*);
+extern  bool_t xdr_guestfs_hexdump_args (XDR *, guestfs_hexdump_args*);
+extern  bool_t xdr_guestfs_hexdump_ret (XDR *, guestfs_hexdump_ret*);
 extern  bool_t xdr_guestfs_procedure (XDR *, guestfs_procedure*);
 extern  bool_t xdr_guestfs_message_direction (XDR *, guestfs_message_direction*);
 extern  bool_t xdr_guestfs_message_status (XDR *, guestfs_message_status*);
@@ -1204,6 +1250,12 @@ extern bool_t xdr_guestfs_drop_caches_args ();
 extern bool_t xdr_guestfs_dmesg_ret ();
 extern bool_t xdr_guestfs_equal_args ();
 extern bool_t xdr_guestfs_equal_ret ();
+extern bool_t xdr_guestfs_strings_args ();
+extern bool_t xdr_guestfs_strings_ret ();
+extern bool_t xdr_guestfs_strings_e_args ();
+extern bool_t xdr_guestfs_strings_e_ret ();
+extern bool_t xdr_guestfs_hexdump_args ();
+extern bool_t xdr_guestfs_hexdump_ret ();
 extern bool_t xdr_guestfs_procedure ();
 extern bool_t xdr_guestfs_message_direction ();
 extern bool_t xdr_guestfs_message_status ();
diff --git a/src/guestfs_protocol.x b/src/guestfs_protocol.x
index f6cab670..42264244 100644
--- a/src/guestfs_protocol.x
+++ b/src/guestfs_protocol.x
@@ -623,6 +623,31 @@ struct guestfs_equal_ret {
   bool equality;
 };
 
+struct guestfs_strings_args {
+  string path<>;
+};
+
+struct guestfs_strings_ret {
+  str stringsout<>;
+};
+
+struct guestfs_strings_e_args {
+  string encoding<>;
+  string path<>;
+};
+
+struct guestfs_strings_e_ret {
+  str stringsout<>;
+};
+
+struct guestfs_hexdump_args {
+  string path<>;
+};
+
+struct guestfs_hexdump_ret {
+  string dump<>;
+};
+
 enum guestfs_procedure {
   GUESTFS_PROC_MOUNT = 1,
   GUESTFS_PROC_SYNC = 2,
@@ -717,6 +742,9 @@ enum guestfs_procedure {
   GUESTFS_PROC_DMESG = 91,
   GUESTFS_PROC_PING_DAEMON = 92,
   GUESTFS_PROC_EQUAL = 93,
+  GUESTFS_PROC_STRINGS = 94,
+  GUESTFS_PROC_STRINGS_E = 95,
+  GUESTFS_PROC_HEXDUMP = 96,
   GUESTFS_PROC_NR_PROCS
 };