From bfc04a9ff126ea5fdbe08e281bfc61b93f31429b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 19 Feb 1996 23:14:44 +0000 Subject: Sun Feb 18 15:08:10 1996 Andreas Schwab * sysdeps/posix/utimes.c (__utimes): There are 1000000 usecs in a sec. Sun Feb 18 13:56:00 1996 Andreas Schwab * elf/Makefile, time/Makefile: Make `all' the default target. Mon Feb 19 18:09:04 1996 Roland McGrath * misc/sys/ptrace.h: Moved to ... * sysdeps/generic/sys/ptrace.h: ... here. * sys/ptrace.h: File removed. Sun Feb 18 12:13:07 1996 Andreas Schwab * sysdeps/unix/sysv/linux/Makefile (headers): Add fpu_control.h. * sysdeps/unix/sysv/linux/i386/sysdep.S (errno): Put it into .bss so that the symbol alias works. * sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_SETCW): Corrected. * sysdeps/unix/sysv/linux/resourcebits.h: New file. * sysdeps/unix/sysv/linux/sys/ptrace.h: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add getegid, geteuid, getppid and reboot. * sysdeps/unix/sysv/linux/sysconf.c: Special version that does not use getdtablesize. Sat Feb 17 10:30:21 1996 David Mosberger-Tang * stdio-common/printf_fp.c, stdlib/strtod.c, sysdeps/ieee754/dbl2mpn.c, sysdeps/ieee754/ldbl2mpn.c, sysdeps/ieee754/mpn2dbl.c, sysdeps/ieee754/mpn2ldbl.c: Cast left operands of shift instructions to `long' where necessary. Thu Feb 15 20:04:50 1996 Ulrich Drepper * stdlib/fpioconst.h: Introduce new constant _FPIO_CONST_OFFSET. * stdio-common/printf_fp.c, stdlib/strtod.c: Use _FPIO_CONST_OFFSET to correctly access MPN array depending on architecture. --- sysdeps/unix/opendir.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'sysdeps/unix/opendir.c') diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index 31111e8c50..5cd620676a 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995 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 @@ -16,6 +16,7 @@ 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. */ +#include #include #include #include @@ -27,11 +28,12 @@ Cambridge, MA 02139, USA. */ #include #include +#include "direct.h" /* This file defines `struct direct'. */ #include "dirstream.h" /* Open a directory stream on NAME. */ DIR * -opendir (const char *name) +DEFUN(opendir, (name), CONST char *name) { DIR *dirp; struct stat statbuf; @@ -60,7 +62,7 @@ opendir (const char *name) goto lose; } - dirp = (DIR *) calloc (1, sizeof (DIR)); /* Zero-fill. */ + dirp = (DIR *) calloc (1, sizeof (DIR) + NAME_MAX); /* Zero-fill. */ if (dirp == NULL) lose: { @@ -71,24 +73,24 @@ opendir (const char *name) } #ifdef _STATBUF_ST_BLKSIZE - if (statbuf.st_blksize < sizeof (struct dirent)) - dirp->allocation = sizeof (struct dirent); + if (statbuf.st_blksize < sizeof (struct direct)) + dirp->__allocation = sizeof (struct direct); else - dirp->allocation = statbuf.st_blksize; + dirp->__allocation = statbuf.st_blksize; #else - dirp->allocation = (BUFSIZ < sizeof (struct dirent) ? - sizeof (struct dirent) : BUFSIZ); + dirp->__allocation = (BUFSIZ < sizeof (struct direct) ? + sizeof (struct direct) : BUFSIZ); #endif - dirp->data = (char *) malloc (dirp->allocation); - if (dirp->data == NULL) + dirp->__data = (char *) malloc (dirp->__allocation); + if (dirp->__data == NULL) { int save = errno; - free (dirp); + free ((PTR) dirp); (void) __close (fd); errno = save; return NULL; } - dirp->fd = fd; + dirp->__fd = fd; return dirp; } -- cgit 1.4.1