diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/readdir64.c | 41 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/readdir64_r.c | 52 |
3 files changed, 98 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 0fe23c9205..f6c5faa372 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-01-06 Mark Kettenis <kettenis@gnu.org> + + * sysdeps/mach/hurd/readdir64.c: New file. + * sysdeps/mach/hurd/readdir64_r.c: New file. + 2001-01-07 Mark Kettenis <kettenis@gnu.org> * sysdeps/mach/hurd/fstatvfs.c (fstatvfs): Add comment about diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c new file mode 100644 index 0000000000..8c94e12265 --- /dev/null +++ b/sysdeps/mach/hurd/readdir64.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2001 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 <dirent.h> +#include <limits.h> +#include <stddef.h> +#include <string.h> + +/* Read a directory entry from DIRP. */ +struct dirent64 * +__readdir64 (DIR *dirp) +{ + struct dirent64 *result; + static union + { + struct dirent64 d; + char b[offsetof (struct dirent64, d_name) + UCHAR_MAX + 1]; + } u; + int err; + + err = __readdir64_r (dirp, &u.d, &result); + + return err ? NULL : result; +} + +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..63c1905663 --- /dev/null +++ b/sysdeps/mach/hurd/readdir64_r.c @@ -0,0 +1,52 @@ +/* Copyright (C) 2001 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 <dirent.h> +#include <limits.h> +#include <stddef.h> +#include <string.h> + +/* Read a directory entry from DIRP. */ +int +__readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result) +{ + struct dirent *result32; + union + { + struct dirent d; + char b[offsetof (struct dirent, d_name) + UCHAR_MAX + 1]; + } u; + int err; + + err = __readdir_r (dirp, &u.d, &result32); + if (result32) + { + entry->d_fileno = result32->d_fileno; + entry->d_reclen = result32->d_reclen; + entry->d_type = result32->d_type; + entry->d_namlen = result32->d_namlen; + memcpy (entry->d_name, result32->d_name, result32->d_namlen + 1); + *result = entry; + } + else + *result = NULL; + + return err; +} + +weak_alias(__readdir64_r, readdir64_r) |