From c0e4567461c09ba47ddbc20e6b0ab09bdb0237ab Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 2 Feb 1997 01:50:11 +0000 Subject: update from main archive 970201 1997-02-02 00:39 Ulrich Drepper * dirent/dirent.h: Add description _DIRENT_HAVE_D_TYPE. 1997-02-01 17:04 Philip Blundell * inet/netinet/ip.h (MAX_IPOPTLEN): Add definition. 1997-02-01 17:00 Ulrich Drepper * sysdeps/unix/sysv/linux/socketbits.h: Add definition of cmsghdr structure plus related macros. * sysdeps/unix/sysv/linux/cmsg_nxthdr.c: New file. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=socket] (sysdep_routines): Add cmsg_nxthdr. * sysdeps/unix/sysv/linux/Dist: Add cmsg_nxthdr.c. Suggested by Philip Blundell . 1997-02-01 12:34 Ulrich Drepper * time/strftime.c: Define _strftime_copytm without protecting arguments which breaks the definition. 1997-02-01 03:31 Thorsten Kukuk * nis/rpcsvc/yp_prot.h: Move definition of yppushresp_xfr after definition of type for element. 1997-02-01 03:28 Philip Blundell * sydsdeps/unix/sysv/linux/netinet/in.h: Add IPv6 related IPPROTO_* constants. 1997-02-01 03:09 H.J. Lu * Makefile: Pass PARALLELMFLAGS to sub-makes. * Makefile.in: Mention PARALLELMFLAGS and pass to main Makefile. 1997-01-31 Paul Eggert * time/mktime.c (HAVE_LIMITS_H, HAVE_LOCALTIME_R, STDC_HEADERS): Define if _LIBC is defined. : Include if HAVE_LIMITS_H instead of if __STDC__ || __GNU_LIBRARY__ || STDC_HEADERS. : Similarly, include if STDC_HEADERS. (localtime_r): Redo #ifdef to make it clear that glibc has localtime_r now. 1997-02-29 20:08 Andreas Schwab * sunrpc/Makefile ($(objpfx)rpcsvc/%.h, $(objpfx)x%.c): Use stamp file to avoid unnecessary recompilation. 1997-01-29 19:33 Andreas Schwab * Makefile: Set install-others, not install_others. (before-compile): Use += to preserve previous value. ($(inst_includedir)/gnu/lib-names.h): Remove obsolete comment and fix dependency name. ($(objpfx)lib-names.h): Remove rule. * Makeconfig ($(common-objpfx)gnu/lib-names.h): Generate it here, with correct name, using an intermediate stamp file. (common-generated): Add gnu/lib-names.h. (before-compile): Add $(common-objpfx)gnu/lib-names.h. 1997-01-30 18:29 Richard Henderson * malloc/malloc.c (MAGICBYTE): Use cast to size_t instead of unsigned to prevent warnings on 64 bit systems. Reported by Paul Wouters . * sysdeps/alpha/dl-machine.h: Revert check for broken gas. By default we assume it works. --- dirent/dirent.h | 73 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) (limited to 'dirent') diff --git a/dirent/dirent.h b/dirent/dirent.h index 449f485c83..3d187e1096 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -39,12 +39,15 @@ __BEGIN_DECLS It defines the macro `_DIRENT_HAVE_D_OFF' iff there is a `d_off' member that gives the file offset of the next directory entry. + + It defines the macro `_DIRENT_HAVE_D_TYPE' iff there is a `d_type' + member that gives the type of the file. */ #include -#if (defined(__USE_BSD) || defined(__USE_MISC)) && !defined(d_fileno) -#define d_ino d_fileno /* Backward compatibility. */ +#if (defined __USE_BSD || defined __USE_MISC) && !defined d_fileno +# define d_ino d_fileno /* Backward compatibility. */ #endif /* These macros extract size information from a `struct dirent *'. @@ -62,16 +65,16 @@ __BEGIN_DECLS */ #ifdef _DIRENT_HAVE_D_NAMLEN -#define _D_EXACT_NAMLEN(d) ((d)->d_namlen) -#define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1) -#else -#define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name)) -#ifdef _DIRENT_HAVE_D_RECLEN -#define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0]) +# define _D_EXACT_NAMLEN(d) ((d)->d_namlen) +# define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1) #else -#define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \ - _D_EXACT_NAMLEN (d) + 1) -#endif +# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name)) +# ifdef _DIRENT_HAVE_D_RECLEN +# define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0]) +# else +# define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \ + _D_EXACT_NAMLEN (d) + 1) +# endif #endif @@ -90,8 +93,8 @@ enum }; /* Convert between stat structure types and directory types. */ -#define IFTODT(mode) (((mode) & 0170000) >> 12) -#define DTTOIF(dirtype) ((dirtype) << 12) +# define IFTODT(mode) (((mode) & 0170000) >> 12) +# define DTTOIF(dirtype) ((dirtype) << 12) #endif @@ -116,42 +119,42 @@ extern int closedir __P ((DIR *__dirp)); extern struct dirent *__readdir __P ((DIR *__dirp)); extern struct dirent *readdir __P ((DIR *__dirp)); -#if defined __USE_POSIX +#if defined __USE_POSIX || defined __USE_MISC /* Reentrant version of `readdir'. Return in RESULT a pointer to the next entry. */ -extern int __readdir_r __P ((DIR *__dirp, struct dirent *entry, - struct dirent **result)); -extern int readdir_r __P ((DIR *__dirp, struct dirent *entry, - struct dirent **result)); -#endif /* POSIX */ +extern int __readdir_r __P ((DIR *__dirp, struct dirent *__entry, + struct dirent **__result)); +extern int readdir_r __P ((DIR *__dirp, struct dirent *__entry, + struct dirent **__result)); +#endif /* POSIX or misc */ /* Rewind DIRP to the beginning of the directory. */ extern void rewinddir __P ((DIR *__dirp)); -#if defined(__USE_BSD) || defined(__USE_MISC) +#if defined __USE_BSD || defined __USE_MISC /* Return the file descriptor used by DIRP. */ extern int dirfd __P ((DIR *__dirp)); -#if defined (__OPTIMIZE__) && defined (_DIR_dirfd) -#define dirfd(dirp) _DIR_dirfd (dirp) -#endif +# if defined __OPTIMIZE__ && defined _DIR_dirfd +# define dirfd(dirp) _DIR_dirfd (dirp) +# endif -#ifndef MAXNAMLEN +# ifndef MAXNAMLEN /* Get the definitions of the POSIX.1 limits. */ -#include +# include /* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'. */ -#ifdef NAME_MAX -#define MAXNAMLEN NAME_MAX -#else -#define MAXNAMLEN 255 -#endif -#endif - -#include -#define __need_size_t -#include +# ifdef NAME_MAX +# define MAXNAMLEN NAME_MAX +# else +# define MAXNAMLEN 255 +# endif +# endif + +# include +# define __need_size_t +# include /* Seek to position POS on DIRP. */ extern void seekdir __P ((DIR *__dirp, __off_t __pos)); -- cgit 1.4.1