2000-02-02 21:36:46 +00:00
|
|
|
|
/* Copyright (C) 1992,93,94,95,96,97,99,2000 Free Software Foundation, Inc.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
|
modify it under the terms of the GNU Library General Public License as
|
|
|
|
|
published by the Free Software Foundation; either version 2 of the
|
|
|
|
|
License, or (at your option) any later version.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
The GNU C Library 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
|
|
|
|
|
Library General Public License for more details.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
#include <hurd.h>
|
1995-10-16 02:51:06 +00:00
|
|
|
|
#include <hurd/lookup.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
#include <fcntl.h>
|
1995-10-18 05:47:53 +00:00
|
|
|
|
#include "stdio-common/_itoa.h"
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#include <hurd/term.h>
|
1999-03-14 12:59:57 +00:00
|
|
|
|
#include <hurd/paths.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Translate the error from dir_lookup into the error the user sees. */
|
|
|
|
|
static inline error_t
|
|
|
|
|
lookup_error (error_t error)
|
|
|
|
|
{
|
|
|
|
|
switch (error)
|
|
|
|
|
{
|
|
|
|
|
case EOPNOTSUPP:
|
|
|
|
|
case MIG_BAD_ID:
|
|
|
|
|
/* These indicate that the server does not understand dir_lookup
|
|
|
|
|
at all. If it were a directory, it would, by definition. */
|
|
|
|
|
return ENOTDIR;
|
|
|
|
|
default:
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error_t
|
1995-10-16 02:51:06 +00:00
|
|
|
|
__hurd_file_name_lookup (error_t (*use_init_port)
|
|
|
|
|
(int which, error_t (*operate) (file_t)),
|
|
|
|
|
file_t (*get_dtable_port) (int fd),
|
1996-06-19 20:11:26 +00:00
|
|
|
|
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),
|
1995-02-18 01:27:10 +00:00
|
|
|
|
const char *file_name, int flags, mode_t mode,
|
|
|
|
|
file_t *result)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
enum retry_type doretry;
|
|
|
|
|
char retryname[1024]; /* XXX string_t LOSES! */
|
1999-03-03 00:31:05 +00:00
|
|
|
|
int startport;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
error_t lookup_op (mach_port_t startdir)
|
1995-10-16 02:51:06 +00:00
|
|
|
|
{
|
1996-06-19 20:11:26 +00:00
|
|
|
|
return lookup_error ((*lookup) (startdir, file_name, flags, mode,
|
|
|
|
|
&doretry, retryname, result));
|
1995-10-16 02:51:06 +00:00
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
if (! lookup)
|
|
|
|
|
lookup = __dir_lookup;
|
|
|
|
|
|
1999-03-03 00:31:05 +00:00
|
|
|
|
startport = (file_name[0] == '/') ? INIT_PORT_CRDIR : INIT_PORT_CWDIR;
|
|
|
|
|
while (file_name[0] == '/')
|
|
|
|
|
file_name++;
|
|
|
|
|
|
|
|
|
|
if (flags & O_NOFOLLOW) /* See comments below about O_NOFOLLOW. */
|
|
|
|
|
flags |= O_NOTRANS;
|
|
|
|
|
|
|
|
|
|
if (flags & O_DIRECTORY)
|
|
|
|
|
{
|
|
|
|
|
/* The caller wants to require that the file we look up is a directory.
|
|
|
|
|
We can do this without an extra RPC by appending a trailing slash
|
|
|
|
|
to the file name we look up. */
|
|
|
|
|
size_t len = strlen (file_name);
|
|
|
|
|
if (len == 0)
|
|
|
|
|
file_name = "/";
|
|
|
|
|
else if (file_name[len - 1] != '/')
|
|
|
|
|
{
|
|
|
|
|
char *n = alloca (len + 2);
|
|
|
|
|
memcpy (n, file_name, len);
|
|
|
|
|
n[len] = '/';
|
|
|
|
|
n[len + 1] = '\0';
|
|
|
|
|
file_name = n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = (*use_init_port) (startport, &lookup_op);
|
1995-10-16 02:51:06 +00:00
|
|
|
|
if (! err)
|
1999-03-03 00:31:05 +00:00
|
|
|
|
err = __hurd_file_name_lookup_retry (use_init_port, get_dtable_port,
|
|
|
|
|
lookup, doretry, retryname,
|
|
|
|
|
flags, mode, result);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return err;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
weak_alias (__hurd_file_name_lookup, hurd_file_name_lookup)
|
|
|
|
|
|
|
|
|
|
error_t
|
1995-10-16 02:51:06 +00:00
|
|
|
|
__hurd_file_name_lookup_retry (error_t (*use_init_port)
|
|
|
|
|
(int which, error_t (*operate) (file_t)),
|
|
|
|
|
file_t (*get_dtable_port) (int fd),
|
1996-06-19 20:11:26 +00:00
|
|
|
|
error_t (*lookup)
|
1999-03-03 00:31:05 +00:00
|
|
|
|
(file_t dir, char *name,
|
|
|
|
|
int flags, mode_t mode,
|
1996-06-19 20:11:26 +00:00
|
|
|
|
retry_type *do_retry, string_t retry_name,
|
|
|
|
|
mach_port_t *result),
|
1995-02-18 01:27:10 +00:00
|
|
|
|
enum retry_type doretry,
|
|
|
|
|
char retryname[1024],
|
|
|
|
|
int flags, mode_t mode,
|
|
|
|
|
file_t *result)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
char *file_name;
|
|
|
|
|
int nloops;
|
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
error_t lookup_op (file_t startdir)
|
1995-10-16 02:51:06 +00:00
|
|
|
|
{
|
|
|
|
|
while (file_name[0] == '/')
|
|
|
|
|
file_name++;
|
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
return lookup_error ((*lookup) (startdir, file_name, flags, mode,
|
|
|
|
|
&doretry, retryname, result));
|
1995-10-16 02:51:06 +00:00
|
|
|
|
}
|
|
|
|
|
error_t reauthenticate (file_t unauth)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
mach_port_t ref = __mach_reply_port ();
|
|
|
|
|
error_t reauth (auth_t auth)
|
|
|
|
|
{
|
1996-05-04 09:46:57 +00:00
|
|
|
|
return __auth_user_authenticate (auth, ref,
|
1995-10-16 02:51:06 +00:00
|
|
|
|
MACH_MSG_TYPE_MAKE_SEND,
|
|
|
|
|
result);
|
|
|
|
|
}
|
|
|
|
|
err = __io_reauthenticate (unauth, ref, MACH_MSG_TYPE_MAKE_SEND);
|
|
|
|
|
if (! err)
|
|
|
|
|
err = (*use_init_port) (INIT_PORT_AUTH, &reauth);
|
|
|
|
|
__mach_port_destroy (__mach_task_self (), ref);
|
|
|
|
|
__mach_port_deallocate (__mach_task_self (), unauth);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
if (! lookup)
|
|
|
|
|
lookup = __dir_lookup;
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
nloops = 0;
|
2000-02-02 21:36:46 +00:00
|
|
|
|
#define CHECK_ELOOP do { \
|
|
|
|
|
if (++nloops > SYMLOOP_MAX) \
|
|
|
|
|
{ \
|
|
|
|
|
if (*result != MACH_PORT_NULL) \
|
|
|
|
|
__mach_port_deallocate (__mach_task_self (), *result); \
|
|
|
|
|
return ELOOP; \
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
err = 0;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
do
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1995-10-16 02:51:06 +00:00
|
|
|
|
file_t startdir = MACH_PORT_NULL;
|
|
|
|
|
int dirport = INIT_PORT_CWDIR;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
switch (doretry)
|
|
|
|
|
{
|
|
|
|
|
case FS_RETRY_REAUTH:
|
1995-10-16 02:51:06 +00:00
|
|
|
|
if (err = reauthenticate (*result))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
return err;
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
|
|
case FS_RETRY_NORMAL:
|
|
|
|
|
/* An empty RETRYNAME indicates we have the final port. */
|
1996-02-08 02:10:15 +00:00
|
|
|
|
if (retryname[0] == '\0' &&
|
|
|
|
|
/* If reauth'd, we must do one more retry on "" to give the new
|
|
|
|
|
translator a chance to make a new port for us. */
|
|
|
|
|
doretry == FS_RETRY_NORMAL)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1999-03-03 00:31:05 +00:00
|
|
|
|
if (flags & O_NOFOLLOW)
|
|
|
|
|
{
|
|
|
|
|
/* In Linux, O_NOFOLLOW means to reject symlinks. If we
|
|
|
|
|
did an O_NOLINK lookup above and io_stat here to check
|
|
|
|
|
for S_IFLNK, a translator like firmlink could easily
|
|
|
|
|
spoof this check by not showing S_IFLNK, but in fact
|
|
|
|
|
redirecting the lookup to some other name
|
|
|
|
|
(i.e. opening the very same holes a symlink would).
|
|
|
|
|
|
|
|
|
|
Instead we do an O_NOTRANS lookup above, and stat the
|
|
|
|
|
underlying node: if it has a translator set, and its
|
|
|
|
|
owner is not root (st_uid 0) then we reject it.
|
|
|
|
|
Since the motivation for this feature is security, and
|
|
|
|
|
that security presumes we trust the containing
|
|
|
|
|
directory, this check approximates the security of
|
|
|
|
|
refusing symlinks while accepting mount points.
|
|
|
|
|
Note that we actually permit something Linux doesn't:
|
|
|
|
|
we follow root-owned symlinks; if that is deemed
|
|
|
|
|
undesireable, we can add a final check for that
|
|
|
|
|
one exception to our general translator-based rule. */
|
|
|
|
|
struct stat st;
|
|
|
|
|
err = __io_stat (*result, &st);
|
|
|
|
|
if (!err
|
|
|
|
|
&& (st.st_mode & (S_IPTRANS|S_IATRANS)))
|
1999-03-14 12:59:57 +00:00
|
|
|
|
{
|
|
|
|
|
if (st.st_uid != 0)
|
|
|
|
|
err = ENOENT;
|
|
|
|
|
else if (st.st_mode & S_IPTRANS)
|
|
|
|
|
{
|
|
|
|
|
char buf[1024];
|
|
|
|
|
char *trans = buf;
|
|
|
|
|
size_t translen = sizeof buf;
|
|
|
|
|
err = __file_get_translator (*result,
|
|
|
|
|
&trans, &translen);
|
|
|
|
|
if (!err
|
|
|
|
|
&& translen > sizeof _HURD_SYMLINK
|
|
|
|
|
&& !memcmp (trans,
|
|
|
|
|
_HURD_SYMLINK, sizeof _HURD_SYMLINK))
|
|
|
|
|
err = ENOENT;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-03-03 00:31:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
/* We got a successful translation. Now apply any open-time
|
|
|
|
|
action flags we were passed. */
|
1999-03-03 00:31:05 +00:00
|
|
|
|
|
|
|
|
|
if (!err && (flags & O_TRUNC)) /* Asked to truncate the file. */
|
1995-09-18 09:00:07 +00:00
|
|
|
|
err = __file_set_size (*result, 0);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
|
__mach_port_deallocate (__mach_task_self (), *result);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-02 21:36:46 +00:00
|
|
|
|
CHECK_ELOOP;
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
startdir = *result;
|
|
|
|
|
file_name = retryname;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FS_RETRY_MAGICAL:
|
|
|
|
|
switch (retryname[0])
|
|
|
|
|
{
|
|
|
|
|
case '/':
|
2000-02-02 21:36:46 +00:00
|
|
|
|
CHECK_ELOOP;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
dirport = INIT_PORT_CRDIR;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (*result != MACH_PORT_NULL)
|
|
|
|
|
__mach_port_deallocate (__mach_task_self (), *result);
|
|
|
|
|
file_name = &retryname[1];
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
|
if (retryname[1] == 'd' && retryname[2] == '/')
|
|
|
|
|
{
|
|
|
|
|
int fd;
|
|
|
|
|
char *end;
|
|
|
|
|
int save = errno;
|
|
|
|
|
errno = 0;
|
1995-10-18 07:36:16 +00:00
|
|
|
|
fd = (int) strtol (&retryname[3], &end, 10);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (end == NULL || errno || /* Malformed number. */
|
|
|
|
|
/* Check for excess text after the number. A slash
|
|
|
|
|
is valid; it ends the component. Anything else
|
|
|
|
|
does not name a numeric file descriptor. */
|
|
|
|
|
(*end != '/' && *end != '\0'))
|
|
|
|
|
{
|
|
|
|
|
errno = save;
|
|
|
|
|
return ENOENT;
|
|
|
|
|
}
|
1995-10-16 02:51:06 +00:00
|
|
|
|
if (! get_dtable_port)
|
|
|
|
|
err = EGRATUITOUS;
|
|
|
|
|
else
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1995-10-16 02:51:06 +00:00
|
|
|
|
*result = (*get_dtable_port) (fd);
|
|
|
|
|
if (*result == MACH_PORT_NULL)
|
|
|
|
|
{
|
|
|
|
|
/* If the name was a proper number, but the file
|
|
|
|
|
descriptor does not exist, we return EBADF instead
|
|
|
|
|
of ENOENT. */
|
|
|
|
|
err = errno;
|
|
|
|
|
errno = save;
|
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
errno = save;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (*end == '\0')
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Do a normal retry on the remaining components. */
|
2000-02-02 21:36:46 +00:00
|
|
|
|
CHECK_ELOOP;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
startdir = *result;
|
|
|
|
|
file_name = end + 1; /* Skip the slash. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto bad_magic;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'm':
|
|
|
|
|
if (retryname[1] == 'a' && retryname[2] == 'c' &&
|
|
|
|
|
retryname[3] == 'h' && retryname[4] == 't' &&
|
|
|
|
|
retryname[5] == 'y' && retryname[6] == 'p' &&
|
|
|
|
|
retryname[7] == 'e')
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
struct host_basic_info hostinfo;
|
|
|
|
|
mach_msg_type_number_t hostinfocnt = HOST_BASIC_INFO_COUNT;
|
|
|
|
|
char *p;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
/* XXX want client's host */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (err = __host_info (__mach_host_self (), HOST_BASIC_INFO,
|
|
|
|
|
(natural_t *) &hostinfo,
|
|
|
|
|
&hostinfocnt))
|
|
|
|
|
return err;
|
|
|
|
|
if (hostinfocnt != HOST_BASIC_INFO_COUNT)
|
|
|
|
|
return EGRATUITOUS;
|
|
|
|
|
p = _itoa (hostinfo.cpu_subtype, &retryname[8], 10, 0);
|
|
|
|
|
*--p = '/';
|
|
|
|
|
p = _itoa (hostinfo.cpu_type, &retryname[8], 10, 0);
|
|
|
|
|
if (p < retryname)
|
|
|
|
|
abort (); /* XXX write this right if this ever happens */
|
|
|
|
|
if (p > retryname)
|
|
|
|
|
strcpy (retryname, p);
|
2000-02-02 21:36:46 +00:00
|
|
|
|
CHECK_ELOOP;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
startdir = *result;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto bad_magic;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 't':
|
|
|
|
|
if (retryname[1] == 't' && retryname[2] == 'y')
|
|
|
|
|
switch (retryname[3])
|
|
|
|
|
{
|
|
|
|
|
error_t opentty (file_t *result)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
error_t ctty_open (file_t port)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
|
if (port == MACH_PORT_NULL)
|
|
|
|
|
return ENXIO; /* No controlling terminal. */
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return __termctty_open_terminal (port,
|
|
|
|
|
flags,
|
|
|
|
|
result);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1995-10-16 02:51:06 +00:00
|
|
|
|
err = (*use_init_port) (INIT_PORT_CTTYID, &ctty_open);
|
|
|
|
|
if (! err)
|
|
|
|
|
err = reauthenticate (*result);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case '\0':
|
|
|
|
|
return opentty (result);
|
|
|
|
|
case '/':
|
|
|
|
|
if (err = opentty (&startdir))
|
|
|
|
|
return err;
|
2000-02-02 21:36:46 +00:00
|
|
|
|
CHECK_ELOOP;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
strcpy (retryname, &retryname[4]);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto bad_magic;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto bad_magic;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
bad_magic:
|
|
|
|
|
return EGRATUITOUS;
|
|
|
|
|
}
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
|
break;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return EGRATUITOUS;
|
|
|
|
|
}
|
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
if (startdir != MACH_PORT_NULL)
|
|
|
|
|
{
|
1996-06-19 20:11:26 +00:00
|
|
|
|
err = lookup_op (startdir);
|
1995-10-16 02:51:06 +00:00
|
|
|
|
__mach_port_deallocate (__mach_task_self (), startdir);
|
|
|
|
|
startdir = MACH_PORT_NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
1996-06-19 20:11:26 +00:00
|
|
|
|
err = (*use_init_port) (dirport, &lookup_op);
|
1995-10-16 02:51:06 +00:00
|
|
|
|
} while (! err);
|
|
|
|
|
|
|
|
|
|
return err;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
weak_alias (__hurd_file_name_lookup_retry, hurd_file_name_lookup_retry)
|
|
|
|
|
|
|
|
|
|
error_t
|
1995-10-16 02:51:06 +00:00
|
|
|
|
__hurd_file_name_split (error_t (*use_init_port)
|
|
|
|
|
(int which, error_t (*operate) (file_t)),
|
|
|
|
|
file_t (*get_dtable_port) (int fd),
|
1996-06-19 20:11:26 +00:00
|
|
|
|
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),
|
1995-02-18 01:27:10 +00:00
|
|
|
|
const char *file_name,
|
|
|
|
|
file_t *dir, char **name)
|
|
|
|
|
{
|
1995-10-16 02:51:06 +00:00
|
|
|
|
error_t addref (file_t crdir)
|
|
|
|
|
{
|
|
|
|
|
*dir = crdir;
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
|
return __mach_port_mod_refs (__mach_task_self (),
|
1995-10-16 02:51:06 +00:00
|
|
|
|
crdir, MACH_PORT_RIGHT_SEND, +1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *lastslash = strrchr (file_name, '/');
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
if (lastslash != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (lastslash == file_name)
|
|
|
|
|
{
|
|
|
|
|
/* "/foobar" => crdir + "foobar". */
|
|
|
|
|
*name = (char *) file_name + 1;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return (*use_init_port) (INIT_PORT_CRDIR, &addref);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* "/dir1/dir2/.../file". */
|
|
|
|
|
char dirname[lastslash - file_name + 1];
|
|
|
|
|
memcpy (dirname, file_name, lastslash - file_name);
|
|
|
|
|
dirname[lastslash - file_name] = '\0';
|
|
|
|
|
*name = (char *) lastslash + 1;
|
1996-06-19 20:11:26 +00:00
|
|
|
|
return
|
|
|
|
|
__hurd_file_name_lookup (use_init_port, get_dtable_port, lookup,
|
|
|
|
|
dirname, 0, 0, dir);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* "foobar" => cwdir + "foobar". */
|
|
|
|
|
*name = (char *) file_name;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return (*use_init_port) (INIT_PORT_CWDIR, &addref);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
weak_alias (__hurd_file_name_split, hurd_file_name_split)
|
|
|
|
|
|
1999-11-13 23:42:45 +00:00
|
|
|
|
/* This is the same as hurd_file_name_split, except that it ignores
|
|
|
|
|
trailing slashes (so *NAME is never ""). */
|
|
|
|
|
error_t
|
|
|
|
|
__hurd_directory_name_split (error_t (*use_init_port)
|
|
|
|
|
(int which, error_t (*operate) (file_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,
|
|
|
|
|
file_t *dir, char **name)
|
|
|
|
|
{
|
|
|
|
|
error_t addref (file_t crdir)
|
|
|
|
|
{
|
|
|
|
|
*dir = crdir;
|
|
|
|
|
return __mach_port_mod_refs (__mach_task_self (),
|
|
|
|
|
crdir, MACH_PORT_RIGHT_SEND, +1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *lastslash = strrchr (file_name, '/');
|
|
|
|
|
|
|
|
|
|
if (lastslash != NULL && lastslash[1] == '\0')
|
|
|
|
|
{
|
|
|
|
|
/* Trailing slash doesn't count. Look back further. */
|
|
|
|
|
|
|
|
|
|
/* Back up over all trailing slashes. */
|
|
|
|
|
while (lastslash > file_name && *lastslash == '/')
|
|
|
|
|
--lastslash;
|
|
|
|
|
|
|
|
|
|
/* Find the last one earlier in the string, before the trailing ones. */
|
|
|
|
|
#if __GLIBC__ > 2 || __GLIBC_MINOR__ >= 2
|
|
|
|
|
lastslash = __memrchr (file_name, '/', lastslash - file_name);
|
|
|
|
|
#else
|
|
|
|
|
/* Keep backing up, looking for a slash. */
|
|
|
|
|
do
|
|
|
|
|
if (lastslash == file_name)
|
|
|
|
|
{
|
|
|
|
|
/* Hit the start with no slash. */
|
|
|
|
|
lastslash = NULL;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
while (*lastslash-- != '/');
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lastslash != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (lastslash == file_name)
|
|
|
|
|
{
|
|
|
|
|
/* "/foobar" => crdir + "foobar". */
|
|
|
|
|
*name = (char *) file_name + 1;
|
|
|
|
|
return (*use_init_port) (INIT_PORT_CRDIR, &addref);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* "/dir1/dir2/.../file". */
|
|
|
|
|
char dirname[lastslash - file_name + 1];
|
|
|
|
|
memcpy (dirname, file_name, lastslash - file_name);
|
|
|
|
|
dirname[lastslash - file_name] = '\0';
|
|
|
|
|
*name = (char *) lastslash + 1;
|
|
|
|
|
return
|
|
|
|
|
__hurd_file_name_lookup (use_init_port, get_dtable_port, lookup,
|
|
|
|
|
dirname, 0, 0, dir);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* "foobar" => cwdir + "foobar". */
|
|
|
|
|
*name = (char *) file_name;
|
|
|
|
|
return (*use_init_port) (INIT_PORT_CWDIR, &addref);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
weak_alias (__hurd_directory_name_split, hurd_directory_name_split)
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
file_t
|
|
|
|
|
__file_name_lookup (const char *file_name, int flags, mode_t mode)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
file_t result;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
err = __hurd_file_name_lookup (&_hurd_ports_use, &__getdport, 0,
|
1996-01-28 22:47:31 +00:00
|
|
|
|
file_name, flags, mode & ~_hurd_umask,
|
1995-02-18 01:27:10 +00:00
|
|
|
|
&result);
|
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return err ? (__hurd_fail (err), MACH_PORT_NULL) : result;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
weak_alias (__file_name_lookup, file_name_lookup)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
file_t
|
|
|
|
|
__file_name_split (const char *file_name, char **name)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
1995-10-16 02:51:06 +00:00
|
|
|
|
file_t result;
|
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
err = __hurd_file_name_split (&_hurd_ports_use, &__getdport, 0,
|
1995-10-16 02:51:06 +00:00
|
|
|
|
file_name, &result, name);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return err ? (__hurd_fail (err), MACH_PORT_NULL) : result;
|
|
|
|
|
}
|
|
|
|
|
weak_alias (__file_name_split, file_name_split)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1999-11-13 23:42:45 +00:00
|
|
|
|
file_t
|
|
|
|
|
__directory_name_split (const char *directory_name, char **name)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
file_t result;
|
|
|
|
|
|
|
|
|
|
err = __hurd_directory_name_split (&_hurd_ports_use, &__getdport, 0,
|
|
|
|
|
directory_name, &result, name);
|
|
|
|
|
|
|
|
|
|
return err ? (__hurd_fail (err), MACH_PORT_NULL) : result;
|
|
|
|
|
}
|
|
|
|
|
weak_alias (__directory_name_split, directory_name_split)
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
file_t
|
|
|
|
|
__file_name_lookup_under (file_t startdir,
|
|
|
|
|
const char *file_name, int flags, mode_t mode)
|
|
|
|
|
{
|
|
|
|
|
error_t err;
|
|
|
|
|
file_t result;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-10-16 02:51:06 +00:00
|
|
|
|
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1995-10-16 02:51:06 +00:00
|
|
|
|
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
|
|
|
|
|
_hurd_ports_use (which, operate));
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1995-10-16 02:51:06 +00:00
|
|
|
|
|
1996-06-19 20:11:26 +00:00
|
|
|
|
err = __hurd_file_name_lookup (&use_init_port, &__getdport, 0,
|
1996-01-28 22:47:31 +00:00
|
|
|
|
file_name, flags, mode & ~_hurd_umask,
|
1995-10-16 02:51:06 +00:00
|
|
|
|
&result);
|
|
|
|
|
|
|
|
|
|
return err ? (__hurd_fail (err), MACH_PORT_NULL) : result;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1995-10-16 02:51:06 +00:00
|
|
|
|
weak_alias (__file_name_lookup_under, file_name_lookup_under)
|