hurd: fix the get-children and get-source procedures

* hurd/fs.defs: Add file_get_children and file_get_source.
* hurd/fsys.defs: Remove fsys_get_children and fsys_get_source.
* libdiskfs/fsys-get-children.c: Rename and adapt accordingly.
* libdiskfs/fsys-get-source.c: Likewise.
* libnetfs/fsys-get-children.c: Likewise.
* libnetfs/fsys-get-source.c: Likewise.
* libtrivfs/fsys-get-children.c: Likewise.
* libtrivfs/fsys-get-source.c: Likewise.
* libdiskfs/diskfs.h: Adapt prototype and comment.
* libnetfs/netfs.h: Likewise.
* libtrivfs/trivfs.h: Likewise.
* libdiskfs/get-source.c: Adapt default implementation, provide
diskfs_disk_name by default.
* libnetfs/netfs.h: Adapt default implementation.
* libtrivfs/get-source.c: Likewise.
* libdiskfs/Makefile: Adapt accordingly.
* libnetfs/Makefile: Likewise.
* libtrivfs/Makefile: Likewise.
* trans/symlink.c: Likewise.
* trans/mtab.c: Likewise.

1 files changed, 108 insertions, 0 deletions

diff --git a/libnetfs/file-get-children.c b/libnetfs/file-get-children.c
new file mode 100644
index 00000000..80a727f5
--- /dev/null
+++ b/libnetfs/file-get-children.c
@@ -0,0 +1,108 @@
+/* file_get_children
+
+   Copyright (C) 2013 Free Software Foundation, Inc.
+
+   Written by Justus Winter <4winter@informatik.uni-hamburg.de>
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd 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, or (at your option)
+   any later version.
+
+   The GNU Hurd 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 the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "priv.h"
+
+#include <argz.h>
+
+/* Return any active translators bound to nodes of the receiving
+   filesystem.  CHILDREN is an argz vector containing file names
+   relative to the root of the receiving translator.  */
+error_t
+netfs_S_file_get_children (struct protid *cred,
+			   char **children,
+			   mach_msg_type_number_t *children_len)
+{
+  error_t err;
+  if (! cred
+      || cred->pi.bucket != netfs_port_bucket
+      || cred->pi.class != netfs_protid_class)
+    return EOPNOTSUPP;
+
+  /* check_access performs the same permission check as is normally
+     done, i.e. it checks that all but the last path components are
+     executable by the requesting user and that the last component is
+     readable.	*/
+  error_t check_access (const char *path)
+  {
+    error_t err;
+    char *elements = NULL;
+    size_t elements_len = 0;
+
+    err = argz_create_sep (path, '/', &elements, &elements_len);
+    if (err)
+      return err;
+
+    struct node *dp = netfs_root_node;
+
+    /* Lock the root node. netfs_attempt_lookup expects the directory to
+       be locked.  */
+    pthread_mutex_lock (&dp->lock);
+
+    /* Increase the reference count, it will be decremented in the loop
+       ahead.  */
+    netfs_nref (dp);
+
+    for (char *entry = elements;
+	 entry;
+	 entry = argz_next (elements, elements_len, entry))
+      {
+	struct node *next;
+	err = netfs_attempt_lookup (cred->user, dp, entry, &next);
+	/* netfs_attempt_lookup has unlocked dp and returned next
+	   locked, so there is no locking to do here.  */
+
+	/* Decrease reference count.  */
+	netfs_nrele (dp);
+
+	if (err)
+	  goto errout;
+
+	dp = next;
+      }
+
+    err = fshelp_access (&dp->nn_stat, S_IRUSR, cred->user);
+
+  errout:
+    /* Unlock and unreference the last node.  */
+    netfs_nput (dp);
+
+    free (elements);
+    return err;
+  }
+
+  char *c = NULL;
+  size_t c_len = 0;
+
+  err = fshelp_get_active_translators (&c, &c_len, check_access);
+  if (err)
+    goto errout;
+
+  err = iohelp_return_malloced_buffer (c, c_len, children, children_len);
+  if (err)
+    goto errout;
+
+  c = NULL; /* c was freed by iohelp_return_malloced_buffer. */
+
+ errout:
+  free (c);
+  return err;
+}