aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-25 18:57:31 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-25 18:57:31 +0000
commit01c771d0ac8ff3588eefd9745e9450962a1bcdd6 (patch)
treeb1383e59c3ebf3a1f833567cfc018b4ca7f4f8f7
parentcf752fe284e3b67e3258ea205669868e2cab340e (diff)
downloadglibc-01c771d0ac8ff3588eefd9745e9450962a1bcdd6.zip
glibc-01c771d0ac8ff3588eefd9745e9450962a1bcdd6.tar.gz
glibc-01c771d0ac8ff3588eefd9745e9450962a1bcdd6.tar.bz2
Update.
* sysdeps/unix/sysv/sysv4/solaris2/getdents.c: New file. Patch by John Tobey <jtobey@banta-im.com>. * sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h: New file.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS9
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h50
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/getdents.c114
4 files changed, 177 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f3a9b7a..fa25c89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
1999-08-25 Ulrich Drepper <drepper@cygnus.com>
+ * sysdeps/unix/sysv/sysv4/solaris2/getdents.c: New file.
+ Patch by John Tobey <jtobey@banta-im.com>.
+
+ * sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h: New file.
+
* sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Move
old_siocfifconf definition to toplevel.
(__protocol_available): Remove old_siocfifconf definition.
diff --git a/NEWS b/NEWS
index 9435866..a027148 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 1999-06-16
+GNU C Library NEWS -- history of user-visible changes. 1999-08-25
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -15,6 +15,13 @@ Version 2.2
* Wide character I/O streams implemented by Ulrich Drepper.
+* functions from the extended socket API added by Ulrich Drepper.
+
+
+Version 2.1.2
+
+* bug fixes
+
Version 2.1.1
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h
new file mode 100644
index 0000000..cc6c999
--- /dev/null
+++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/dirent.h
@@ -0,0 +1,50 @@
+/* Copyright (C) 1996, 1997, 1999 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
+
+struct dirent
+ {
+#ifndef __USE_FILE_OFFSET64
+ __ino_t d_ino;
+ __off_t d_off;
+#else
+ __ino64_t d_ino;
+ __off64_t d_off;
+#endif
+ unsigned short int d_reclen;
+ char d_name[256]; /* We must not include limits.h! */
+ };
+
+#ifdef __USE_LARGEFILE64
+struct dirent64
+ {
+ __ino64_t d_ino;
+ __off64_t d_off;
+ unsigned short int d_reclen;
+ char d_name[256]; /* We must not include limits.h! */
+ };
+#endif
+
+#define d_fileno d_ino /* Backwards compatibility. */
+
+#undef _DIRENT_HAVE_D_NAMLEN
+#define _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_OFF
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/getdents.c b/sysdeps/unix/sysv/sysv4/solaris2/getdents.c
new file mode 100644
index 0000000..2cf2a57
--- /dev/null
+++ b/sysdeps/unix/sysv/sysv4/solaris2/getdents.c
@@ -0,0 +1,114 @@
+/* Copyright (C) 1993,95,96,97,98 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 <alloca.h>
+#include <dirent.h>
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
+
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+
+
+extern int __getdents __P ((int fd, char *buf, size_t nbytes));
+
+/* For Solaris we need a special version of this file since the
+ definition of `struct dirent' is not the same for the kernel and
+ the libc. There is one additional field which might be introduced
+ in the kernel structure in the future.
+
+ He is the system definition of `struct dirent' as of 2.6: */
+
+struct kernel_dirent
+ {
+ ino_t d_ino;
+ off_t d_off;
+ unsigned short int d_reclen;
+ char d_name[256];
+ };
+
+#ifdef GETDENTS64
+#define __getdirentries __getdirentries64
+#define dirent dirent64
+#endif
+
+/* The problem here is that we cannot simply read the next NBYTES
+ bytes. We need to take the additional field into account. We use
+ some heuristic. Assuming the directory contains names with 14
+ characters on average we can compute an estimate number of entries
+ which fit in the buffer. Taking this number allows us to specify a
+ correct number of bytes to read. If we should be wrong, we can reset
+ the file descriptor. */
+ssize_t
+__getdirentries (int fd, char *buf, size_t nbytes, off_t *basep)
+{
+ off_t base = __lseek (fd, (off_t) 0, SEEK_CUR);
+ off_t last_offset = base;
+ size_t red_nbytes;
+ struct kernel_dirent *skdp, *kdp;
+ struct dirent *dp;
+ int retval;
+ const size_t size_diff = (offsetof (struct dirent, d_name)
+ - offsetof (struct kernel_dirent, d_name));
+
+ red_nbytes = nbytes - ((nbytes / (offsetof (struct dirent, d_name) + 14))
+ * size_diff);
+
+ dp = (struct dirent *) buf;
+ skdp = kdp = __alloca (red_nbytes);
+
+ retval = __getdents (fd, (char *) kdp, red_nbytes);
+
+ while ((char *) kdp < (char *) skdp + retval)
+ {
+ const size_t alignment = __alignof__ (struct dirent);
+ /* Since kdp->d_reclen is already aligned for the kernel structure
+ this may compute a value that is bigger than necessary. */
+ size_t new_reclen = ((kdp->d_reclen + size_diff + alignment - 1)
+ & ~(alignment - 1));
+ if ((char *) dp + new_reclen > buf + nbytes)
+ {
+ /* Our heuristic failed. We read too many entries. Reset
+ the stream. */
+ __lseek (fd, last_offset, SEEK_SET);
+ break;
+ }
+
+ last_offset = kdp->d_off;
+ dp->d_ino = kdp->d_ino;
+ dp->d_off = kdp->d_off;
+ dp->d_reclen = new_reclen;
+ dp->d_type = DT_UNKNOWN;
+ memcpy (dp->d_name, kdp->d_name,
+ kdp->d_reclen - offsetof (struct kernel_dirent, d_name));
+
+ dp = (struct dirent *) ((char *) dp + new_reclen);
+ kdp = (struct kernel_dirent *) (((char *) kdp) + kdp->d_reclen);
+ }
+
+ if (basep)
+ *basep = base;
+
+ return (char *) dp - buf;
+}
+
+#ifndef GETDENTS64
+weak_alias (__getdirentries, getdirentries)
+#endif