From bf0f472003fa3f6984edb8fb6ae2489680d3e763 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 19 Jun 1996 22:38:55 +0000 Subject: *** empty log message *** Wed Jun 19 10:21:24 1996 Miles Bader * hurd/hurdlookup.c (__hurd_file_name_lookup_retry, __hurd_file_name_lookup, __hurd_file_name_split): Add & use LOOKUP argument. Rename nested function lookup to lookup_op. (__file_name_lookup, __file_name_lookup_under): Pass 0 for lookup arg to __hurd_file_name_lookup. (__file_name_split): Likewise for __hurd_file_name_split. * hurd/path-lookup.c (hurd_file_name_path_lookup): Add LOOKUP argument. Rename nested function lookup to scan_lookup. (file_name_path_lookup): Pass 0 for lookup arg to hurd_file_name_path_lookup. * hurd/hurd/lookup.h (__hurd_file_name_lookup, hurd_file_name_lookup, __hurd_file_name_lookup_retry, hurd_file_name_lookup_retry: __hurd_file_name_split, hurd_file_name_split, hurd_file_name_lookup): Add LOOKUP argument. * sysdeps/mach/hurd/access.c (__access): Pass 0 lookup arg to __hurd_file_name_lookup. --- hurd/path-lookup.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'hurd/path-lookup.c') diff --git a/hurd/path-lookup.c b/hurd/path-lookup.c index 9e0fff4..cc12454 100644 --- a/hurd/path-lookup.c +++ b/hurd/path-lookup.c @@ -89,20 +89,23 @@ file_name_path_scan (const char *file_name, const char *path, malloced storage containing the prefixed name. */ error_t hurd_file_name_path_lookup (error_t (*use_init_port) - (int which, - error_t (*operate) (mach_port_t)), + (int which, error_t (*operate) (mach_port_t)), file_t (*get_dtable_port) (int fd), + error_t (*lookup) + (file_t dir, char *name, int flags, mode_t mode, + retry_type *do_retry, string_t retry_name, + mach_port_t *result), const char *file_name, const char *path, int flags, mode_t mode, file_t *result, char **prefixed_name) { - error_t lookup (const char *name) + error_t scan_lookup (const char *name) { return - __hurd_file_name_lookup (use_init_port, get_dtable_port, + __hurd_file_name_lookup (use_init_port, get_dtable_port, lookup, name, flags, mode, result); } - return file_name_path_scan (file_name, path, lookup, prefixed_name); + return file_name_path_scan (file_name, path, scan_lookup, prefixed_name); } file_t @@ -112,7 +115,7 @@ file_name_path_lookup (const char *file_name, const char *path, error_t err; file_t result; - err = hurd_file_name_path_lookup (&_hurd_ports_use, &__getdport, + err = hurd_file_name_path_lookup (&_hurd_ports_use, &__getdport, 0, file_name, path, flags, mode, &result, prefixed_name); -- cgit v1.1