diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/dirent.h | 67 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/readdir64.c | 51 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/readdir64_r.c | 57 |
4 files changed, 177 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index b3161ca195..948920dfc1 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -92,8 +92,8 @@ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \ -chmod a-w $(hurd)/errnos.h-tmp ./$(..)move-if-change $(hurd)/errnos.h-tmp $(hurd)/errnos.h ifeq ($(with-cvs),yes) - test ! -d CVS || \ - (cd $(hurd); cvs commit -m'Regenerated from $^' errnos.h) + test ! -d $(hurd)/CVS || \ + (cd $(hurd) && cvs commit -m'Regenerated from $^' errnos.h) endif touch $@ diff --git a/sysdeps/mach/hurd/bits/dirent.h b/sysdeps/mach/hurd/bits/dirent.h new file mode 100644 index 0000000000..6609fde8ea --- /dev/null +++ b/sysdeps/mach/hurd/bits/dirent.h @@ -0,0 +1,67 @@ +/* Directory entry structure `struct dirent'. Hurd version. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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. + + 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. + + 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. */ + +#ifndef _DIRENT_H +# error "Never use <bits/dirent.h> directly; include <dirent.h> instead." +#endif + +#ifndef __USE_FILE_OFFSET64 +/* The old BSD4.4-compatible struct dirent. */ +struct dirent + { + __ino_t d_ino; /* File serial number. */ + unsigned short int d_reclen; /* Length of the whole `struct dirent'. */ + unsigned char d_type; /* File type, possibly unknown. */ + unsigned char d_namlen; /* Length of the file name. */ + + /* Only this member is in the POSIX standard. */ + char d_name[1]; /* File name (actually longer). */ + }; + +#else +/* Linux-style 64-bit struct dirent. */ +struct dirent + { + __ino64_t d_ino; + __off64_t d_off; + unsigned short int d_reclen; + unsigned char d_type; + char d_name[256]; /* We must not include limits.h! */ + }; +#endif + +#ifdef __USE_LARGEFILE64 +/* Same as above (Linux-style 64-bit struct dirent). */ +struct dirent64 + { + __ino64_t d_ino; + __off64_t d_off; + unsigned short int d_reclen; + unsigned char d_type; + char d_name[256]; /* We must not include limits.h! */ + }; +#endif + +#define d_fileno d_ino /* Backwards compatibility. */ + +/* These definitions are accurate for neither the 32-bit nor the + 64-bit structures, but at least they are compatible. */ +#undef _DIRENT_HAVE_D_NAMLEN +#define _DIRENT_HAVE_D_RECLEN 1 +#define _DIRENT_HAVE_D_TYPE 1 diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c new file mode 100644 index 0000000000..aed5e0199a --- /dev/null +++ b/sysdeps/mach/hurd/readdir64.c @@ -0,0 +1,51 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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. + + 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. + + 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. */ + +#include <errno.h> +#include <limits.h> +#include <stddef.h> +#include <string.h> +#include <dirent.h> +#include <unistd.h> +#include <sys/types.h> + +/* Read a directory entry from DIRP. */ +struct dirent64 * +__readdir64 (DIR *dirp) +{ + struct dirent *dp; + static struct dirent64 dent; + + /* XXX the new __dir_readdir64 RPC is not yet implemented */ + + /* If __dir_readdir64 failed, then fall back on the old implementation */ + dp = readdir (dirp); + if (!dp) + return NULL; + + /* Return a struct dirent64, converted from the 32-bit value. */ + memset (&dent, 0, sizeof (dent)); + dent.d_reclen = sizeof (dent); + + dent.d_ino = dp->d_fileno; + dent.d_type = dp->d_type; + memcpy (dent.d_name, dp->d_name, dp->d_namlen); + + return &dent; +} +weak_alias (__readdir64, readdir64) diff --git a/sysdeps/mach/hurd/readdir64_r.c b/sysdeps/mach/hurd/readdir64_r.c new file mode 100644 index 0000000000..bd00b0eb08 --- /dev/null +++ b/sysdeps/mach/hurd/readdir64_r.c @@ -0,0 +1,57 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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. + + 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. + + 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. */ + +#include <errno.h> +#include <limits.h> +#include <stddef.h> +#include <string.h> +#include <dirent.h> +#include <unistd.h> +#include <sys/types.h> + +/* Read a directory entry from DIRP. */ +int +__readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result) +{ + struct dirent ent32, *res32; + + /* XXX the new __dir_readdir64 RPC is not yet implemented */ + + /* If __dir_readdir64 failed, then fall back on the old implementation */ + if (readdir_r (dirp, &ent32, &res32)) + return -1; + + if (!res32) + { + /* End of directory. */ + *result = 0; + return 0; + } + + /* Convert our result from the 32-bit value. */ + memset (entry, 0, sizeof (*entry)); + entry->d_reclen = sizeof (*entry); + + entry->d_ino = res32->d_fileno; + entry->d_type = res32->d_type; + memcpy (entry->d_name, res32->d_name, res32->d_namlen); + + *result = entry; + return 0; +} +weak_alias (__readdir64_r, readdir64_r) |