mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include <pty.h>. * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc.
189 lines
6.0 KiB
C
189 lines
6.0 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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. */
|
|
|
|
/*
|
|
* POSIX Standard: 5.1.2 Directory Operations <dirent.h>
|
|
*/
|
|
|
|
#ifndef _DIRENT_H
|
|
|
|
#define _DIRENT_H 1
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#include <gnu/types.h>
|
|
|
|
/* This file defines `struct dirent'.
|
|
|
|
It defines the macro `_DIRENT_HAVE_D_NAMLEN' iff there is a `d_namlen'
|
|
member that gives the length of `d_name'.
|
|
|
|
It defines the macro `_DIRENT_HAVE_D_RECLEN' iff there is a `d_reclen'
|
|
member that gives the size of the entire directory entry.
|
|
|
|
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.
|
|
*/
|
|
|
|
#include <direntry.h>
|
|
|
|
#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 *'.
|
|
They may evaluate their argument multiple times, so it must not
|
|
have side effects. Each of these may involve a relatively costly
|
|
call to `strlen' on some systems, so these values should be cached.
|
|
|
|
_D_EXACT_NAMLEN (DP) returns the length of DP->d_name, not including
|
|
its terminating null character.
|
|
|
|
_D_ALLOC_NAMLEN (DP) returns a size at least (_D_EXACT_NAMLEN (DP) + 1);
|
|
that is, the allocation size needed to hold the DP->d_name string.
|
|
Use this macro when you don't need the exact length, just an upper bound.
|
|
This macro is less likely to require calling `strlen' than _D_EXACT_NAMLEN.
|
|
*/
|
|
|
|
#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])
|
|
#else
|
|
#define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
|
|
_D_EXACT_NAMLEN (d) + 1)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_BSD
|
|
/* File types for `d_type'. */
|
|
enum
|
|
{
|
|
DT_UNKNOWN = 0,
|
|
DT_FIFO = 1,
|
|
DT_CHR = 2,
|
|
DT_DIR = 4,
|
|
DT_BLK = 6,
|
|
DT_REG = 8,
|
|
DT_LNK = 10,
|
|
DT_SOCK = 12
|
|
};
|
|
|
|
/* Convert between stat structure types and directory types. */
|
|
#define IFTODT(mode) (((mode) & 0170000) >> 12)
|
|
#define DTTOIF(dirtype) ((dirtype) << 12)
|
|
#endif
|
|
|
|
|
|
/* This is the data type of directory stream objects.
|
|
The actual structure is opaque to users. */
|
|
typedef struct __dirstream DIR;
|
|
|
|
/* Open a directory stream on NAME.
|
|
Return a DIR stream on the directory, or NULL if it could not be opened. */
|
|
extern DIR *__opendir __P ((__const char *__name));
|
|
extern DIR *opendir __P ((__const char *__name));
|
|
|
|
/* Close the directory stream DIRP.
|
|
Return 0 if successful, -1 if not. */
|
|
extern int __closedir __P ((DIR * __dirp));
|
|
extern int closedir __P ((DIR * __dirp));
|
|
|
|
/* Read a directory entry from DIRP.
|
|
Return a pointer to a `struct dirent' describing the entry,
|
|
or NULL for EOF or error. The storage returned may be overwritten
|
|
by a later readdir call on the same DIR stream. */
|
|
extern struct dirent *__readdir __P ((DIR * __dirp));
|
|
extern struct dirent *readdir __P ((DIR * __dirp));
|
|
|
|
#ifdef __USE_REENTRANT
|
|
/* Reentrant versio of `readdir'. Return in RESULT a pointer to the
|
|
next entry. */
|
|
extern int readdir_r __P ((DIR *__dirp, struct dirent *entry,
|
|
struct dirent **result));
|
|
#endif
|
|
|
|
/* Rewind DIRP to the beginning of the directory. */
|
|
extern void rewinddir __P ((DIR * __dirp));
|
|
|
|
#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
|
|
|
|
#ifndef MAXNAMLEN
|
|
/* Get the definitions of the POSIX.1 limits. */
|
|
#include <posix1_lim.h>
|
|
|
|
/* `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 <gnu/types.h>
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
/* Seek to position POS on DIRP. */
|
|
extern void seekdir __P ((DIR * __dirp, __off_t __pos));
|
|
|
|
/* Return the current position of DIRP. */
|
|
extern __off_t telldir __P ((DIR * __dirp));
|
|
|
|
/* Scan the directory DIR, calling SELECT on each directory entry.
|
|
Entries for which SELECT returns nonzero are individually malloc'd,
|
|
sorted using qsort with CMP, and collected in a malloc'd array in
|
|
*NAMELIST. Returns the number of entries selected, or -1 on error. */
|
|
extern int scandir __P ((__const char *__dir,
|
|
struct dirent ***__namelist,
|
|
int (*__select) __P ((struct dirent *)),
|
|
int (*__cmp) __P ((__const __ptr_t,
|
|
__const __ptr_t))));
|
|
|
|
/* Function to compare two `struct dirent's alphabetically. */
|
|
extern int alphasort __P ((__const __ptr_t, __const __ptr_t));
|
|
|
|
|
|
/* Read directory entries from FD into BUF, reading at most NBYTES.
|
|
Reading starts at offset *BASEP, and *BASEP is updated with the new
|
|
position after reading. Returns the number of bytes read; zero when at
|
|
end of directory; or -1 for errors. */
|
|
extern __ssize_t __getdirentries __P ((int __fd, char *__buf,
|
|
size_t __nbytes, __off_t *__basep));
|
|
extern __ssize_t getdirentries __P ((int __fd, char *__buf,
|
|
size_t __nbytes, __off_t *__basep));
|
|
|
|
|
|
#endif /* Use BSD or misc. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* dirent.h */
|