From 9366d6b2e48ba409366adc0516825c41a86dec9b Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Thu, 30 Jan 2014 10:53:46 +0100
Subject: 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.
---
 libdiskfs/Makefile            |  2 +-
 libdiskfs/diskfs.h            |  9 ++--
 libdiskfs/file-get-children.c | 95 +++++++++++++++++++++++++++++++++++++++++
 libdiskfs/file-get-source.c   | 37 ++++++++++++++++
 libdiskfs/fsys-get-children.c | 99 -------------------------------------------
 libdiskfs/fsys-get-source.c   | 34 ---------------
 libdiskfs/get-source.c        |  9 +++-
 7 files changed, 145 insertions(+), 140 deletions(-)
 create mode 100644 libdiskfs/file-get-children.c
 create mode 100644 libdiskfs/file-get-source.c
 delete mode 100644 libdiskfs/fsys-get-children.c
 delete mode 100644 libdiskfs/fsys-get-source.c

(limited to 'libdiskfs')

diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile
index 03c2e2b3..aeebe4e9 100644
--- a/libdiskfs/Makefile
+++ b/libdiskfs/Makefile
@@ -35,7 +35,7 @@ IOSRCS= io-async-icky.c io-async.c io-duplicate.c io-get-conch.c io-revoke.c \
 	io-select.c io-stat.c io-stubs.c io-write.c io-version.c io-sigio.c
 FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-startup.c fsys-getfile.c \
 	fsys-options.c fsys-syncfs.c fsys-forward.c \
-	fsys-get-children.c fsys-get-source.c
+	file-get-children.c file-get-source.c
 IFSOCKSRCS=ifsock.c
 OTHERSRCS = conch-fetch.c conch-set.c dir-clear.c dir-init.c dir-renamed.c \
 	extern-inline.c \
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h
index 22262aa8..db6a1d84 100644
--- a/libdiskfs/diskfs.h
+++ b/libdiskfs/diskfs.h
@@ -569,10 +569,11 @@ error_t (*diskfs_create_symlink_hook)(struct node *np, const char *target);
 error_t (*diskfs_read_symlink_hook)(struct node *np, char *target);
 
 /* The user may define this function.  The function must set source to
-   the source device of the filesystem. The function may return an
-   EOPNOTSUPP to indicate that the concept of a source device is not
-   applicable. The default function always returns EOPNOTSUPP. */
-error_t diskfs_get_source (char *source);
+   the source of CRED. The function may return an EOPNOTSUPP to
+   indicate that the concept of a source device is not applicable. The
+   default function always returns EOPNOTSUPP. */
+error_t diskfs_get_source (struct protid *cred,
+                           char *source, size_t source_len);
 
 /* The library exports the following functions for general use */
 
diff --git a/libdiskfs/file-get-children.c b/libdiskfs/file-get-children.c
new file mode 100644
index 00000000..4581e4e0
--- /dev/null
+++ b/libdiskfs/file-get-children.c
@@ -0,0 +1,95 @@
+/* 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 "fs_S.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
+diskfs_S_file_get_children (struct protid *cred,
+			    char **children,
+			    mach_msg_type_number_t *children_len)
+{
+  error_t err;
+  if (! cred
+      || cred->pi.bucket != diskfs_port_bucket
+      || cred->pi.class != diskfs_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 = diskfs_root_node;
+
+    for (char *entry = elements;
+	 entry;
+	 entry = argz_next (elements, elements_len, entry))
+      {
+	struct node *next;
+	err = diskfs_lookup (dp, entry, LOOKUP, &next, NULL, cred);
+
+	if (dp != diskfs_root_node)
+	  diskfs_nput (dp);
+
+	if (err)
+	  return err;
+
+	dp = next;
+      }
+
+    err = fshelp_access (&dp->dn_stat, S_IRUSR, cred->user);
+    diskfs_nput (dp);
+    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;
+}
diff --git a/libdiskfs/file-get-source.c b/libdiskfs/file-get-source.c
new file mode 100644
index 00000000..b5c31845
--- /dev/null
+++ b/libdiskfs/file-get-source.c
@@ -0,0 +1,37 @@
+/* file_get_source
+
+   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 "fs_S.h"
+
+/* Return information about the source of the receiving
+   filesystem.	*/
+error_t
+diskfs_S_file_get_source (struct protid *cred,
+			  char *source)
+{
+  if (! cred
+      || cred->pi.bucket != diskfs_port_bucket
+      || cred->pi.class != diskfs_protid_class)
+    return EOPNOTSUPP;
+
+  return diskfs_get_source (cred, source, 1024 /* XXX */);
+}
diff --git a/libdiskfs/fsys-get-children.c b/libdiskfs/fsys-get-children.c
deleted file mode 100644
index 69c9963e..00000000
--- a/libdiskfs/fsys-get-children.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* fsys_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 "fsys_S.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
-diskfs_S_fsys_get_children (fsys_t server,
-			    mach_port_t reply,
-			    mach_msg_type_name_t replyPoly,
-			    char **children,
-			    mach_msg_type_number_t *children_len)
-{
-  error_t err;
-
-  struct protid *cred = ports_lookup_port (diskfs_port_bucket,
-					   server,
-					   diskfs_protid_class);
-  if (! cred)
-    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 = diskfs_root_node;
-
-    for (char *entry = elements;
-	 entry;
-	 entry = argz_next (elements, elements_len, entry))
-      {
-	struct node *next;
-	err = diskfs_lookup (dp, entry, LOOKUP, &next, NULL, cred);
-
-	if (dp != diskfs_root_node)
-	  diskfs_nput (dp);
-
-	if (err)
-	  return err;
-
-	dp = next;
-      }
-
-    err = fshelp_access (&dp->dn_stat, S_IRUSR, cred->user);
-    diskfs_nput (dp);
-    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;
-}
diff --git a/libdiskfs/fsys-get-source.c b/libdiskfs/fsys-get-source.c
deleted file mode 100644
index 08f227c9..00000000
--- a/libdiskfs/fsys-get-source.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* fsys_get_source
-
-   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 "fsys_S.h"
-
-/* Return information about the source of the receiving
-   filesystem.	*/
-error_t
-diskfs_S_fsys_get_source (fsys_t server,
-			  mach_port_t reply,
-			  mach_msg_type_name_t replyPoly,
-			  char *source)
-{
-  return diskfs_get_source (source);
-}
diff --git a/libdiskfs/get-source.c b/libdiskfs/get-source.c
index d0c143be..43994464 100644
--- a/libdiskfs/get-source.c
+++ b/libdiskfs/get-source.c
@@ -22,7 +22,12 @@
 #include "priv.h"
 
 error_t
-diskfs_get_source (char *source)
+diskfs_get_source (struct protid *cred, char *source, size_t source_len)
 {
-  return EOPNOTSUPP;
+  if (diskfs_disk_name == NULL)
+    return EOPNOTSUPP;
+
+  strncpy (source, diskfs_disk_name, source_len - 1);
+  source[source_len - 1] = '\0';
+  return 0;
 }
-- 
cgit v1.2.3