diff options
Diffstat (limited to 'libdiskfs')
| -rw-r--r-- | libdiskfs/dir-lookup.c | 61 | ||||
| -rw-r--r-- | libdiskfs/fsys-getroot.c | 13 | ||||
| -rw-r--r-- | libdiskfs/trans-callback.c | 4 |
3 files changed, 28 insertions, 50 deletions
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index 72ada0f4..8b43e27b 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -20,6 +20,7 @@ #include <fcntl.h> #include <string.h> #include <sys/file.h> +#include <hurd/fshelp.h> #include <hurd/fsys.h> #include <hurd/paths.h> @@ -225,43 +226,6 @@ diskfs_S_dir_lookup (struct protid *dircred, mach_port_t dirport; struct iouser *user; - /* A callback function for short-circuited translators. - S_ISLNK and S_IFSOCK are handled elsewhere. */ - error_t short_circuited_callback1 (void *cookie1, void *cookie2, - uid_t *uid, gid_t *gid, - char **argz, size_t *argz_len) - { - struct node *node = cookie1; - - switch (node->dn_stat.st_mode & S_IFMT) - { - case S_IFCHR: - case S_IFBLK: - if (asprintf (argz, "%s%c%d%c%d", - (S_ISCHR (node->dn_stat.st_mode) - ? _HURD_CHRDEV : _HURD_BLKDEV), - 0, major (node->dn_stat.st_rdev), - 0, minor (node->dn_stat.st_rdev)) < 0) - return ENOMEM; - *argz_len = strlen (*argz) + 1; - *argz_len += strlen (*argz + *argz_len) + 1; - *argz_len += strlen (*argz + *argz_len) + 1; - break; - case S_IFIFO: - if (asprintf (argz, "%s", _HURD_FIFO) < 0) - return ENOMEM; - *argz_len = strlen (*argz) + 1; - break; - default: - return ENOENT; - } - - *uid = node->dn_stat.st_uid; - *gid = node->dn_stat.st_gid; - - return 0; - } - /* Create an unauthenticated port for DNP, and then unlock it. */ err = iohelp_create_empty_iouser (&user); @@ -292,14 +256,21 @@ diskfs_S_dir_lookup (struct protid *dircred, boolean_t register_translator = np->transbox.active == MACH_PORT_NULL; - err = fshelp_fetch_root (&np->transbox, dircred->po, - dirport, dircred->user, - lastcomp ? flags : 0, - ((np->dn_stat.st_mode & S_IPTRANS) - ? _diskfs_translator_callback1 - : short_circuited_callback1), - _diskfs_translator_callback2, - do_retry, retry_name, retry_port); + struct fshelp_stat_cookie2 cookie = { + .statp = &np->dn_stat, + .modep = &np->dn_stat.st_mode, + .next = dircred->po, + }; + err = fshelp_fetch_root (&np->transbox, + &cookie, + dirport, + dircred->user, + lastcomp ? flags : 0, + ((np->dn_stat.st_mode & S_IPTRANS) + ? _diskfs_translator_callback1 + : fshelp_short_circuited_callback1), + _diskfs_translator_callback2, + do_retry, retry_name, retry_port); /* fetch_root copies DIRPORT for success, so we always should deallocate our send right. */ diff --git a/libdiskfs/fsys-getroot.c b/libdiskfs/fsys-getroot.c index 401f1032..6f93888f 100644 --- a/libdiskfs/fsys-getroot.c +++ b/libdiskfs/fsys-getroot.c @@ -21,6 +21,7 @@ #include "priv.h" #include "fsys_S.h" +#include <hurd/fshelp.h> #include <hurd/fsys.h> #include <fcntl.h> @@ -78,11 +79,15 @@ diskfs_S_fsys_getroot (struct diskfs_control *pt, || fshelp_translated (&diskfs_root_node->transbox)) && !(flags & O_NOTRANS)) { + struct fshelp_stat_cookie2 cookie = { + .next = &peropen_context, + }; + err = fshelp_fetch_root (&diskfs_root_node->transbox, - &peropen_context, dotdot, &user, flags, - _diskfs_translator_callback1, - _diskfs_translator_callback2, - retry, retryname, returned_port); + &cookie, dotdot, &user, flags, + _diskfs_translator_callback1, + _diskfs_translator_callback2, + retry, retryname, returned_port); if (err != ENOENT) { pthread_mutex_unlock (&diskfs_root_node->lock); diff --git a/libdiskfs/trans-callback.c b/libdiskfs/trans-callback.c index 283b184f..15e8f9a1 100644 --- a/libdiskfs/trans-callback.c +++ b/libdiskfs/trans-callback.c @@ -20,6 +20,7 @@ #include "priv.h" #include <fcntl.h> +#include <hurd/fshelp.h> /* Callback function needed for calls to fshelp_fetch_root. See <hurd/fshelp.h> for the interface description. */ @@ -56,6 +57,7 @@ _diskfs_translator_callback2_fn (void *cookie1, void *cookie2, mach_msg_type_name_t *underlying_type) { struct node *np = cookie1; + struct fshelp_stat_cookie2 *statc = cookie2; struct protid *cred; struct peropen *po; error_t err; @@ -66,7 +68,7 @@ _diskfs_translator_callback2_fn (void *cookie1, void *cookie2, if (err) return err; - err = diskfs_make_peropen (np, flags, cookie2, &po); + err = diskfs_make_peropen (np, flags, statc->next, &po); if (! err) { err = diskfs_create_protid (po, user, &cred); |