Add 'readdir' call.

This adds a readdir call (mostly intended for programs).  The
return value is a list of guestfs_dirent structures.

This adds the new types 'struct guestfs_dirent' and
'struct guestfs_dirent_list', along with all the code to
return these in the different language bindings.

Also includes additional tests for OCaml and Perl bindings
to test this.

4 files changed, 137 insertions, 0 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 8884c6b2..8b909c50 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -51,6 +51,7 @@ guestfsd_SOURCES = \
 	ntfs.c \
 	pingdaemon.c \
 	proto.c \
+	readdir.c \
 	scrub.c \
 	sfdisk.c \
 	sleep.c \
diff --git a/daemon/actions.h b/daemon/actions.h
index ad44d535..9eaf87bb 100644
--- a/daemon/actions.h
+++ b/daemon/actions.h
@@ -158,3 +158,4 @@ extern int do_mkfifo (int mode, char *path);
 extern int do_mknod_b (int mode, int devmajor, int devminor, char *path);
 extern int do_mknod_c (int mode, int devmajor, int devminor, char *path);
 extern int do_umask (int mask);
+extern guestfs_int_dirent_list *do_readdir (char *dir);
diff --git a/daemon/readdir.c b/daemon/readdir.c
new file mode 100644
index 00000000..cea6fdd4
--- /dev/null
+++ b/daemon/readdir.c
@@ -0,0 +1,105 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2009 Red Hat Inc. 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+
+#include "daemon.h"
+#include "actions.h"
+
+guestfs_int_dirent_list *
+do_readdir (char *path)
+{
+  guestfs_int_dirent_list *ret;
+  guestfs_int_dirent v;
+  DIR *dir;
+  struct dirent *d;
+  int i;
+
+  NEED_ROOT (NULL);
+  ABS_PATH (path, NULL);
+
+  ret = malloc (sizeof *ret);
+  if (ret == NULL) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
+
+  ret->guestfs_int_dirent_list_len = 0;
+  ret->guestfs_int_dirent_list_val = NULL;
+
+  CHROOT_IN;
+  dir = opendir (path);
+  CHROOT_OUT;
+
+  if (dir == NULL) {
+    reply_with_perror ("opendir: %s", path);
+    free (ret);
+    return NULL;
+  }
+
+  i = 0;
+  while ((d = readdir (dir)) != NULL) {
+    guestfs_int_dirent *p;
+
+    p = realloc (ret->guestfs_int_dirent_list_val,
+		 sizeof (guestfs_int_dirent) * (i+1));
+    v.name = strdup (d->d_name);
+    if (!p || !v.name) {
+      reply_with_perror ("allocate");
+      free (ret->guestfs_int_dirent_list_val);
+      free (ret);
+      closedir (dir);
+      return NULL;
+    }
+    ret->guestfs_int_dirent_list_val = p;
+
+    v.ino = d->d_ino;
+    switch (d->d_type) {
+    case DT_BLK: v.ftyp = 'b'; break;
+    case DT_CHR: v.ftyp = 'c'; break;
+    case DT_DIR: v.ftyp = 'd'; break;
+    case DT_FIFO: v.ftyp = 'f'; break;
+    case DT_LNK: v.ftyp = 'l'; break;
+    case DT_REG: v.ftyp = 'r'; break;
+    case DT_SOCK: v.ftyp = 's'; break;
+    case DT_UNKNOWN: v.ftyp = 'u'; break;
+    default: v.ftyp = '?'; break;
+    }
+
+    ret->guestfs_int_dirent_list_val[i] = v;
+
+    i++;
+  }
+
+  ret->guestfs_int_dirent_list_len = i;
+
+  if (closedir (dir) == -1) {
+    reply_with_perror ("closedir");
+    free (ret->guestfs_int_dirent_list_val);
+    free (ret);
+    return NULL;
+  }
+
+  return ret;
+}
diff --git a/daemon/stubs.c b/daemon/stubs.c
index 033f42cd..9c2bfefe 100644
--- a/daemon/stubs.c
+++ b/daemon/stubs.c
@@ -3477,6 +3477,33 @@ done:
   xdr_free ((xdrproc_t) xdr_guestfs_umask_args, (char *) &args);
 }
 
+static void readdir_stub (XDR *xdr_in)
+{
+  guestfs_int_dirent_list *r;
+  struct guestfs_readdir_args args;
+  char *dir;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_readdir_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "readdir");
+    return;
+  }
+  dir = args.dir;
+
+  r = do_readdir (dir);
+  if (r == NULL)
+    /* do_readdir has already called reply_with_error */
+    goto done;
+
+  struct guestfs_readdir_ret ret;
+  ret.entries = *r;
+  reply ((xdrproc_t) xdr_guestfs_readdir_ret, (char *) &ret);
+  xdr_free ((xdrproc_t) xdr_guestfs_readdir_ret, (char *) &ret);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_readdir_args, (char *) &args);
+}
+
 void dispatch_incoming_message (XDR *xdr_in)
 {
   switch (proc_nr) {
@@ -3891,6 +3918,9 @@ void dispatch_incoming_message (XDR *xdr_in)
     case GUESTFS_PROC_UMASK:
       umask_stub (xdr_in);
       break;
+    case GUESTFS_PROC_READDIR:
+      readdir_stub (xdr_in);
+      break;
     default:
       reply_with_error ("dispatch_incoming_message: unknown procedure number %d, set LIBGUESTFS_PATH to point to the matching libguestfs appliance directory", proc_nr);
   }