From: Roland McGrath <roland@gnu.org>
Date: Tue, 27 Feb 1996 14:51:36 +0000 (+0000)
Subject: Mon Feb 26 10:22:30 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>
X-Git-Tag: glibc-2.16-ports-before-merge~3881
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d4439738a02f57dae3a7981c23925393548b784;p=thirdparty%2Fglibc.git

Mon Feb 26 10:22:30 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>

	* sysdeps/unix/dirstream.h: Rewritten.
	* sysdeps/unix/readdir.c: Rewritten.
	* sysdeps/unix/telldir.c: Rewritten.
	* sysdeps/unix/closedir.c: Use <...> instead of "..." for dirstream.h.
	Remove __ from DIR struct member names.
	* sysdeps/unix/dirfd.c: Likewise.
	* sysdeps/unix/seekdir.c: Likewise.
	* sysdeps/unix/rewinddir.c: Likewise.
	* sysdeps/unix/opendir.c: Likewise.  Don't allocate extra space after
	DIR structure.
	* sysdeps/stub/direct.h: File removed.
	* sysdeps/unix/bsd/bsd4.4/direct.h: File removed.
	* sysdeps/unix/bsd/direct.h: File removed.
	* sysdeps/unix/common/direct.h: File removed.
	* sysdeps/unix/sysv/irix4/direct.h: File removed.
	* sysdeps/unix/sysv/isc3/direct.h: File removed.
	* sysdeps/unix/sysv/sco3.2.4/direct.h: File removed.
	* sysdeps/unix/sysv/sysv4/solaris2/direct.h: File removed.
	* sysdeps/unix/common/direntry.h: New file.
	* sysdeps/unix/bsd/direntry.h: New file.
	* sysdeps/unix/bsd/bsd4.4/direntry.h: New file.
	* sysdeps/unix/sysv/direntry.h: New file.
	* sysdeps/stub/direntry.h: New file.
	* dirent/dirent.h (struct dirent): Type removed.  Include <direntry.h>
	to define it.
	(_D_EXACT_NAMLEN, _D_ALLOC_NAMLEN): New macros.
	* dirent/Makefile (headers): Add direntry.h.
	(distribute): Remove direct.h.
	* sysdeps/posix/getcwd.c: Use new macros instead of d_namlen.
	* dirent/scandir.c: Likewise.
	* io/fts.c (fts_build): Likewise.
	* io/ftw.c (ftw_dir): Likewise.
	* sysdeps/posix/ttyname.c: Likewise.
---

diff --git a/sysdeps/unix/sysv/irix4/direct.h b/sysdeps/unix/sysv/irix4/direct.h
deleted file mode 100644
index 153087fef5f..00000000000
--- a/sysdeps/unix/sysv/irix4/direct.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef	MAXNAMLEN
-#define	MAXNAMLEN	255
-#endif
-
-struct direct
-  {
-    unsigned long int d_ino;
-    off_t d_off;
-    unsigned short int d_reclen;
-    char d_name[MAXNAMLEN + 1];
-  };
-
-#define D_NAMLEN(d) (strlen ((d)->d_name))
-
-#define D_RECLEN(d) (d->d_reclen)
diff --git a/sysdeps/unix/sysv/sco3.2.4/direct.h b/sysdeps/unix/sysv/sco3.2.4/direct.h
deleted file mode 100644
index b3eaa54c8b0..00000000000
--- a/sysdeps/unix/sysv/sco3.2.4/direct.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef	MAXNAMLEN
-#define	MAXNAMLEN	512
-#endif
-#define DIRBUF	        1048	/* minimum buffer size for call to getdents */
-
-struct direct
-  {
-    unsigned short int d_fileno;
-    short int d_pad;
-    long int d_off;
-    unsigned short int d_reclen;
-    char d_name[1];		/* Actually longer. */
-  };
-
-#include <stddef.h>
-
-/* We calculate the length of the name by taking the length of the whole
-   `struct direct' record, subtracting the size of everything before the
-   name, and subtracting one for the terminating null.  */
-
-#define D_NAMLEN(d) \
-  ((d)->d_reclen - offsetof (struct direct, d_name) - 1)
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/direct.h b/sysdeps/unix/sysv/sysv4/solaris2/direct.h
deleted file mode 100644
index f9822dcbc5d..00000000000
--- a/sysdeps/unix/sysv/sysv4/solaris2/direct.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 1992, 1993 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#ifndef	   _BSDDIR_H
-#define	   _BSDDIR_H	1
-
-#include <limits.h>
-
-/* This is the Solaris direct; it's the same as that in
-   sysdeps/unix/sysv/sysv4/direct.h, but it uses the length given by d_namlen,
-   since we can't reliably use tyhe sysv4/direct.h method of computing
-   the length.  */
-
-struct direct
-  {
-    unsigned long int d_fileno;
-    long int d_off;
-    unsigned short int d_reclen;
-    char d_name[NAME_MAX + 1];
-  };
-
-#define D_NAMLEN(d) (strlen ((d)->d_name))
-
-#endif