X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FGuestfs.xs;h=c1eaa11f540269bb34ef44700d6adb21768837cf;hp=3cc47750c545afb6725bf6226af494c785180ae4;hb=98a43eba2fe2b18f5042138556c6beede0277223;hpb=c168ce1c91c8f4f615ec53e140970e0017ad750d

diff --git a/perl/Guestfs.xs b/perl/Guestfs.xs
index 3cc4775..c1eaa11 100644
--- a/perl/Guestfs.xs
+++ b/perl/Guestfs.xs
@@ -57,20 +57,32 @@ my_newSVull(unsigned long long val) {
 #endif
 }
 
-/* XXX Not thread-safe, and in general not safe if the caller is
- * issuing multiple requests in parallel (on different guestfs
- * handles).  We should use the guestfs_h handle passed to the
- * error handle to distinguish these cases.
- */
-static char *last_error = NULL;
-
-static void
-error_handler (guestfs_h *g,
-	       void *data,
-	       const char *msg)
-{
-  if (last_error != NULL) free (last_error);
-  last_error = strdup (msg);
+/* http://www.perlmonks.org/?node_id=680842 */
+static char **
+XS_unpack_charPtrPtr (SV *arg) {
+  char **ret;
+  AV *av;
+  I32 i;
+
+  if (!arg || !SvOK (arg) || !SvROK (arg) || SvTYPE (SvRV (arg)) != SVt_PVAV) {
+    croak ("array reference expected");
+  }
+
+  av = (AV *)SvRV (arg);
+  ret = (char **)malloc (av_len (av) + 1 + 1);
+
+  for (i = 0; i <= av_len (av); i++) {
+    SV **elem = av_fetch (av, i, 0);
+
+    if (!elem || !*elem)
+      croak ("missing element in list");
+
+    ret[i] = SvPV_nolen (*elem);
+  }
+
+  ret[i] = NULL;
+
+  return ret;
 }
 
 MODULE = Sys::Guestfs  PACKAGE = Sys::Guestfs
@@ -81,7 +93,7 @@ _create ()
       RETVAL = guestfs_create ();
       if (!RETVAL)
         croak ("could not create guestfs handle");
-      guestfs_set_error_handler (RETVAL, error_handler, NULL);
+      guestfs_set_error_handler (RETVAL, NULL, NULL);
  OUTPUT:
       RETVAL
 
@@ -94,56 +106,77 @@ DESTROY (g)
 void
 launch (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_launch (g) == -1)
-        croak ("launch: %s", last_error);
+      r = guestfs_launch (g);
+      if (r == -1)
+        croak ("launch: %s", guestfs_last_error (g));
 
 void
 wait_ready (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_wait_ready (g) == -1)
-        croak ("wait_ready: %s", last_error);
+      r = guestfs_wait_ready (g);
+      if (r == -1)
+        croak ("wait_ready: %s", guestfs_last_error (g));
 
 void
 kill_subprocess (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_kill_subprocess (g) == -1)
-        croak ("kill_subprocess: %s", last_error);
+      r = guestfs_kill_subprocess (g);
+      if (r == -1)
+        croak ("kill_subprocess: %s", guestfs_last_error (g));
 
 void
 add_drive (g, filename)
       guestfs_h *g;
       char *filename;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_add_drive (g, filename) == -1)
-        croak ("add_drive: %s", last_error);
+      r = guestfs_add_drive (g, filename);
+      if (r == -1)
+        croak ("add_drive: %s", guestfs_last_error (g));
 
 void
 add_cdrom (g, filename)
       guestfs_h *g;
       char *filename;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_add_cdrom (g, filename) == -1)
-        croak ("add_cdrom: %s", last_error);
+      r = guestfs_add_cdrom (g, filename);
+      if (r == -1)
+        croak ("add_cdrom: %s", guestfs_last_error (g));
 
 void
 config (g, qemuparam, qemuvalue)
       guestfs_h *g;
       char *qemuparam;
       char *qemuvalue;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_config (g, qemuparam, qemuvalue) == -1)
-        croak ("config: %s", last_error);
+      r = guestfs_config (g, qemuparam, qemuvalue);
+      if (r == -1)
+        croak ("config: %s", guestfs_last_error (g));
 
 void
 set_path (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_path (g, path) == -1)
-        croak ("set_path: %s", last_error);
+      r = guestfs_set_path (g, path);
+      if (r == -1)
+        croak ("set_path: %s", guestfs_last_error (g));
 
 SV *
 get_path (g)
@@ -153,7 +186,7 @@ PREINIT:
    CODE:
       path = guestfs_get_path (g);
       if (path == NULL)
-        croak ("get_path: %s", last_error);
+        croak ("get_path: %s", guestfs_last_error (g));
       RETVAL = newSVpv (path, 0);
  OUTPUT:
       RETVAL
@@ -162,9 +195,12 @@ void
 set_autosync (g, autosync)
       guestfs_h *g;
       int autosync;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_autosync (g, autosync) == -1)
-        croak ("set_autosync: %s", last_error);
+      r = guestfs_set_autosync (g, autosync);
+      if (r == -1)
+        croak ("set_autosync: %s", guestfs_last_error (g));
 
 SV *
 get_autosync (g)
@@ -174,7 +210,7 @@ PREINIT:
    CODE:
       autosync = guestfs_get_autosync (g);
       if (autosync == -1)
-        croak ("get_autosync: %s", last_error);
+        croak ("get_autosync: %s", guestfs_last_error (g));
       RETVAL = newSViv (autosync);
  OUTPUT:
       RETVAL
@@ -183,9 +219,12 @@ void
 set_verbose (g, verbose)
       guestfs_h *g;
       int verbose;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_set_verbose (g, verbose) == -1)
-        croak ("set_verbose: %s", last_error);
+      r = guestfs_set_verbose (g, verbose);
+      if (r == -1)
+        croak ("set_verbose: %s", guestfs_last_error (g));
 
 SV *
 get_verbose (g)
@@ -195,7 +234,7 @@ PREINIT:
    CODE:
       verbose = guestfs_get_verbose (g);
       if (verbose == -1)
-        croak ("get_verbose: %s", last_error);
+        croak ("get_verbose: %s", guestfs_last_error (g));
       RETVAL = newSViv (verbose);
  OUTPUT:
       RETVAL
@@ -205,24 +244,33 @@ mount (g, device, mountpoint)
       guestfs_h *g;
       char *device;
       char *mountpoint;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_mount (g, device, mountpoint) == -1)
-        croak ("mount: %s", last_error);
+      r = guestfs_mount (g, device, mountpoint);
+      if (r == -1)
+        croak ("mount: %s", guestfs_last_error (g));
 
 void
 sync (g)
       guestfs_h *g;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_sync (g) == -1)
-        croak ("sync: %s", last_error);
+      r = guestfs_sync (g);
+      if (r == -1)
+        croak ("sync: %s", guestfs_last_error (g));
 
 void
 touch (g, path)
       guestfs_h *g;
       char *path;
+PREINIT:
+      int r;
  PPCODE:
-      if (guestfs_touch (g, path) == -1)
-        croak ("touch: %s", last_error);
+      r = guestfs_touch (g, path);
+      if (r == -1)
+        croak ("touch: %s", guestfs_last_error (g));
 
 SV *
 cat (g, path)
@@ -233,7 +281,7 @@ PREINIT:
    CODE:
       content = guestfs_cat (g, path);
       if (content == NULL)
-        croak ("cat: %s", last_error);
+        croak ("cat: %s", guestfs_last_error (g));
       RETVAL = newSVpv (content, 0);
       free (content);
  OUTPUT:
@@ -248,7 +296,7 @@ PREINIT:
    CODE:
       listing = guestfs_ll (g, directory);
       if (listing == NULL)
-        croak ("ll: %s", last_error);
+        croak ("ll: %s", guestfs_last_error (g));
       RETVAL = newSVpv (listing, 0);
       free (listing);
  OUTPUT:
@@ -264,7 +312,7 @@ PREINIT:
  PPCODE:
       listing = guestfs_ls (g, directory);
       if (listing == NULL)
-        croak ("ls: %s", last_error);
+        croak ("ls: %s", guestfs_last_error (g));
       for (n = 0; listing[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -282,7 +330,7 @@ PREINIT:
  PPCODE:
       devices = guestfs_list_devices (g);
       if (devices == NULL)
-        croak ("list_devices: %s", last_error);
+        croak ("list_devices: %s", guestfs_last_error (g));
       for (n = 0; devices[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -300,7 +348,7 @@ PREINIT:
  PPCODE:
       partitions = guestfs_list_partitions (g);
       if (partitions == NULL)
-        croak ("list_partitions: %s", last_error);
+        croak ("list_partitions: %s", guestfs_last_error (g));
       for (n = 0; partitions[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -318,7 +366,7 @@ PREINIT:
  PPCODE:
       physvols = guestfs_pvs (g);
       if (physvols == NULL)
-        croak ("pvs: %s", last_error);
+        croak ("pvs: %s", guestfs_last_error (g));
       for (n = 0; physvols[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -336,7 +384,7 @@ PREINIT:
  PPCODE:
       volgroups = guestfs_vgs (g);
       if (volgroups == NULL)
-        croak ("vgs: %s", last_error);
+        croak ("vgs: %s", guestfs_last_error (g));
       for (n = 0; volgroups[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -354,7 +402,7 @@ PREINIT:
  PPCODE:
       logvols = guestfs_lvs (g);
       if (logvols == NULL)
-        croak ("lvs: %s", last_error);
+        croak ("lvs: %s", guestfs_last_error (g));
       for (n = 0; logvols[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {
@@ -373,7 +421,7 @@ PREINIT:
  PPCODE:
       physvols = guestfs_pvs_full (g);
       if (physvols == NULL)
-        croak ("pvs_full: %s", last_error);
+        croak ("pvs_full: %s", guestfs_last_error (g));
       EXTEND (SP, physvols->len);
       for (i = 0; i < physvols->len; ++i) {
         hv = newHV ();
@@ -405,7 +453,7 @@ PREINIT:
  PPCODE:
       volgroups = guestfs_vgs_full (g);
       if (volgroups == NULL)
-        croak ("vgs_full: %s", last_error);
+        croak ("vgs_full: %s", guestfs_last_error (g));
       EXTEND (SP, volgroups->len);
       for (i = 0; i < volgroups->len; ++i) {
         hv = newHV ();
@@ -442,7 +490,7 @@ PREINIT:
  PPCODE:
       logvols = guestfs_lvs_full (g);
       if (logvols == NULL)
-        croak ("lvs_full: %s", last_error);
+        croak ("lvs_full: %s", guestfs_last_error (g));
       EXTEND (SP, logvols->len);
       for (i = 0; i < logvols->len; ++i) {
         hv = newHV ();
@@ -476,7 +524,485 @@ PREINIT:
  PPCODE:
       lines = guestfs_read_lines (g, path);
       if (lines == NULL)
-        croak ("read_lines: %s", last_error);
+        croak ("read_lines: %s", guestfs_last_error (g));
+      for (n = 0; lines[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (lines[i], 0)));
+        free (lines[i]);
+      }
+      free (lines);
+
+void
+aug_init (g, root, flags)
+      guestfs_h *g;
+      char *root;
+      int flags;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_init (g, root, flags);
+      if (r == -1)
+        croak ("aug_init: %s", guestfs_last_error (g));
+
+void
+aug_close (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_close (g);
+      if (r == -1)
+        croak ("aug_close: %s", guestfs_last_error (g));
+
+SV *
+aug_defvar (g, name, expr)
+      guestfs_h *g;
+      char *name;
+      char *expr;
+PREINIT:
+      int nrnodes;
+   CODE:
+      nrnodes = guestfs_aug_defvar (g, name, expr);
+      if (nrnodes == -1)
+        croak ("aug_defvar: %s", guestfs_last_error (g));
+      RETVAL = newSViv (nrnodes);
+ OUTPUT:
+      RETVAL
+
+void
+aug_defnode (g, name, expr, val)
+      guestfs_h *g;
+      char *name;
+      char *expr;
+      char *val;
+PREINIT:
+      struct guestfs_int_bool *r;
+ PPCODE:
+      r = guestfs_aug_defnode (g, name, expr, val);
+      if (r == NULL)
+        croak ("aug_defnode: %s", guestfs_last_error (g));
+      EXTEND (SP, 2);
+      PUSHs (sv_2mortal (newSViv (r->i)));
+      PUSHs (sv_2mortal (newSViv (r->b)));
+      guestfs_free_int_bool (r);
+
+SV *
+aug_get (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      char *val;
+   CODE:
+      val = guestfs_aug_get (g, path);
+      if (val == NULL)
+        croak ("aug_get: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (val, 0);
+      free (val);
+ OUTPUT:
+      RETVAL
+
+void
+aug_set (g, path, val)
+      guestfs_h *g;
+      char *path;
+      char *val;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_set (g, path, val);
+      if (r == -1)
+        croak ("aug_set: %s", guestfs_last_error (g));
+
+void
+aug_insert (g, path, label, before)
+      guestfs_h *g;
+      char *path;
+      char *label;
+      int before;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_insert (g, path, label, before);
+      if (r == -1)
+        croak ("aug_insert: %s", guestfs_last_error (g));
+
+SV *
+aug_rm (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int nrnodes;
+   CODE:
+      nrnodes = guestfs_aug_rm (g, path);
+      if (nrnodes == -1)
+        croak ("aug_rm: %s", guestfs_last_error (g));
+      RETVAL = newSViv (nrnodes);
+ OUTPUT:
+      RETVAL
+
+void
+aug_mv (g, src, dest)
+      guestfs_h *g;
+      char *src;
+      char *dest;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_mv (g, src, dest);
+      if (r == -1)
+        croak ("aug_mv: %s", guestfs_last_error (g));
+
+void
+aug_match (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      char **matches;
+      int i, n;
+ PPCODE:
+      matches = guestfs_aug_match (g, path);
+      if (matches == NULL)
+        croak ("aug_match: %s", guestfs_last_error (g));
+      for (n = 0; matches[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (matches[i], 0)));
+        free (matches[i]);
+      }
+      free (matches);
+
+void
+aug_save (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_save (g);
+      if (r == -1)
+        croak ("aug_save: %s", guestfs_last_error (g));
+
+void
+aug_load (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_aug_load (g);
+      if (r == -1)
+        croak ("aug_load: %s", guestfs_last_error (g));
+
+void
+aug_ls (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      char **matches;
+      int i, n;
+ PPCODE:
+      matches = guestfs_aug_ls (g, path);
+      if (matches == NULL)
+        croak ("aug_ls: %s", guestfs_last_error (g));
+      for (n = 0; matches[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (matches[i], 0)));
+        free (matches[i]);
+      }
+      free (matches);
+
+void
+rm (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_rm (g, path);
+      if (r == -1)
+        croak ("rm: %s", guestfs_last_error (g));
+
+void
+rmdir (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_rmdir (g, path);
+      if (r == -1)
+        croak ("rmdir: %s", guestfs_last_error (g));
+
+void
+rm_rf (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_rm_rf (g, path);
+      if (r == -1)
+        croak ("rm_rf: %s", guestfs_last_error (g));
+
+void
+mkdir (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mkdir (g, path);
+      if (r == -1)
+        croak ("mkdir: %s", guestfs_last_error (g));
+
+void
+mkdir_p (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mkdir_p (g, path);
+      if (r == -1)
+        croak ("mkdir_p: %s", guestfs_last_error (g));
+
+void
+chmod (g, mode, path)
+      guestfs_h *g;
+      int mode;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_chmod (g, mode, path);
+      if (r == -1)
+        croak ("chmod: %s", guestfs_last_error (g));
+
+void
+chown (g, owner, group, path)
+      guestfs_h *g;
+      int owner;
+      int group;
+      char *path;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_chown (g, owner, group, path);
+      if (r == -1)
+        croak ("chown: %s", guestfs_last_error (g));
+
+SV *
+exists (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int existsflag;
+   CODE:
+      existsflag = guestfs_exists (g, path);
+      if (existsflag == -1)
+        croak ("exists: %s", guestfs_last_error (g));
+      RETVAL = newSViv (existsflag);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_file (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int fileflag;
+   CODE:
+      fileflag = guestfs_is_file (g, path);
+      if (fileflag == -1)
+        croak ("is_file: %s", guestfs_last_error (g));
+      RETVAL = newSViv (fileflag);
+ OUTPUT:
+      RETVAL
+
+SV *
+is_dir (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      int dirflag;
+   CODE:
+      dirflag = guestfs_is_dir (g, path);
+      if (dirflag == -1)
+        croak ("is_dir: %s", guestfs_last_error (g));
+      RETVAL = newSViv (dirflag);
+ OUTPUT:
+      RETVAL
+
+void
+pvcreate (g, device)
+      guestfs_h *g;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_pvcreate (g, device);
+      if (r == -1)
+        croak ("pvcreate: %s", guestfs_last_error (g));
+
+void
+vgcreate (g, volgroup, physvols)
+      guestfs_h *g;
+      char *volgroup;
+      char **physvols;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_vgcreate (g, volgroup, physvols);
+      free (physvols);
+      if (r == -1)
+        croak ("vgcreate: %s", guestfs_last_error (g));
+
+void
+lvcreate (g, logvol, volgroup, mbytes)
+      guestfs_h *g;
+      char *logvol;
+      char *volgroup;
+      int mbytes;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_lvcreate (g, logvol, volgroup, mbytes);
+      if (r == -1)
+        croak ("lvcreate: %s", guestfs_last_error (g));
+
+void
+mkfs (g, fstype, device)
+      guestfs_h *g;
+      char *fstype;
+      char *device;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_mkfs (g, fstype, device);
+      if (r == -1)
+        croak ("mkfs: %s", guestfs_last_error (g));
+
+void
+sfdisk (g, device, cyls, heads, sectors, lines)
+      guestfs_h *g;
+      char *device;
+      int cyls;
+      int heads;
+      int sectors;
+      char **lines;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_sfdisk (g, device, cyls, heads, sectors, lines);
+      free (lines);
+      if (r == -1)
+        croak ("sfdisk: %s", guestfs_last_error (g));
+
+void
+write_file (g, path, content, size)
+      guestfs_h *g;
+      char *path;
+      char *content;
+      int size;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_write_file (g, path, content, size);
+      if (r == -1)
+        croak ("write_file: %s", guestfs_last_error (g));
+
+void
+umount (g, pathordevice)
+      guestfs_h *g;
+      char *pathordevice;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_umount (g, pathordevice);
+      if (r == -1)
+        croak ("umount: %s", guestfs_last_error (g));
+
+void
+mounts (g)
+      guestfs_h *g;
+PREINIT:
+      char **devices;
+      int i, n;
+ PPCODE:
+      devices = guestfs_mounts (g);
+      if (devices == NULL)
+        croak ("mounts: %s", guestfs_last_error (g));
+      for (n = 0; devices[n] != NULL; ++n) /**/;
+      EXTEND (SP, n);
+      for (i = 0; i < n; ++i) {
+        PUSHs (sv_2mortal (newSVpv (devices[i], 0)));
+        free (devices[i]);
+      }
+      free (devices);
+
+void
+umount_all (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_umount_all (g);
+      if (r == -1)
+        croak ("umount_all: %s", guestfs_last_error (g));
+
+void
+lvm_remove_all (g)
+      guestfs_h *g;
+PREINIT:
+      int r;
+ PPCODE:
+      r = guestfs_lvm_remove_all (g);
+      if (r == -1)
+        croak ("lvm_remove_all: %s", guestfs_last_error (g));
+
+SV *
+file (g, path)
+      guestfs_h *g;
+      char *path;
+PREINIT:
+      char *description;
+   CODE:
+      description = guestfs_file (g, path);
+      if (description == NULL)
+        croak ("file: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (description, 0);
+      free (description);
+ OUTPUT:
+      RETVAL
+
+SV *
+command (g, arguments)
+      guestfs_h *g;
+      char **arguments;
+PREINIT:
+      char *output;
+   CODE:
+      output = guestfs_command (g, arguments);
+      free (arguments);
+      if (output == NULL)
+        croak ("command: %s", guestfs_last_error (g));
+      RETVAL = newSVpv (output, 0);
+      free (output);
+ OUTPUT:
+      RETVAL
+
+void
+command_lines (g, arguments)
+      guestfs_h *g;
+      char **arguments;
+PREINIT:
+      char **lines;
+      int i, n;
+ PPCODE:
+      lines = guestfs_command_lines (g, arguments);
+      free (arguments);
+      if (lines == NULL)
+        croak ("command_lines: %s", guestfs_last_error (g));
       for (n = 0; lines[n] != NULL; ++n) /**/;
       EXTEND (SP, n);
       for (i = 0; i < n; ++i) {