mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	1998-06-07 13:32 Ulrich Drepper <drepper@cygnus.com> * libc.map: Add _dl_profile. * elf/dl-reloc.c (_dl_relocate_object): Take extra argument, pass this to ELF_DYNAMIC_RELOCATE. Always allocate array for relocation result if LD_PROFILE is defined. * elf/ldsodefs.h: Adjust prototypes. * elf/dl-open.c (_dl_open): Call relocation function with extra argument. * elf/rtld.c: Likewise. * elf/dl-profile.c (_dl_mcount): Don't mark as internal function. Correct loop condition. * elf/dynamic-link.h: Don't examine _dl_profile variable, pass consider_profile to runtime setup function. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Use _dl_runtime_profile for all shared objects if LD_PROFILE is defined. * elf/dl-support.c: Define __libc_stack_end. * elf/rtld.c: Likewise. * sysdeps/generic/libc-start.c: Store last stack address in __libc_stack_end. * sysdeps/i386/dl-machine.h (_dl_start_user): Store stack address. * sysdeps/i386/elf/start.s: Call __libc_start_main with extra argument. * elf/elf.h: Include <features.h>, not <sys/cdefs.h>. Include <stdint.h>, not <inttypes.h>. * elf/sprof.c: Implement flat profiling. * libio/fgetc.c: Call _IO_cleanup_region_end with 0 and call _IO_funlockfile explicitly. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/freopen64.c: Likewise. * libio/fseek.c: Likewise. * libio/fseeko.c: Likewise. * libio/fseeko64.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * malloc/mtrace.c: Pretty print. * misc/mntent.h (struct mentent): Make string elements const char *. * nis/nis_printf.c: Optimize I/O a little bit. * signal/Makefile (distribute): Add sigset-cvt-mask.h. * sysdeps/generic/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/linux/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h: New file. * sysdeps/posix/sigvec.c: Rewrite the use definitions from sigset-cvt-mask.h to do the dirty work. Patches by Joe Keane. * sysdeps/posix/mkstemp.c: Save one precious byte of rodata. * sysdeps/unix/sysv/linux/i386/sysdep.h: Rewrite PSEUDO etc to make syscall_error label in case of PIC anonymous. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/mmap.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pread64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pwrite64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/socket.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/syscall.S: Adapt for this change.
		
			
				
	
	
		
			127 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			127 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 1994, 1996, 1997, 1998 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU IO Library.
 | |
| 
 | |
|    This library is free software; you can redistribute it and/or
 | |
|    modify it under the terms of the GNU General Public License as
 | |
|    published by the Free Software Foundation; either version 2, or (at
 | |
|    your option) any later version.
 | |
| 
 | |
|    This 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
 | |
|    General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU General Public License
 | |
|    along with this library; see the file COPYING.  If not, write to
 | |
|    the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
 | |
|    MA 02111-1307, USA.
 | |
| 
 | |
|    As a special exception, if you link this library with files
 | |
|    compiled with a GNU compiler to produce an executable, this does
 | |
|    not cause the resulting executable to be covered by the GNU General
 | |
|    Public License.  This exception does not however invalidate any
 | |
|    other reasons why the executable file might be covered by the GNU
 | |
|    General Public License.  */
 | |
| 
 | |
| #ifdef __STDC__
 | |
| #include <stdlib.h>
 | |
| #endif
 | |
| #include "libioP.h"
 | |
| #include <string.h>
 | |
| #include <errno.h>
 | |
| 
 | |
| /* Read up to (and including) a TERMINATOR from FP into *LINEPTR
 | |
|    (and null-terminate it).  *LINEPTR is a pointer returned from malloc (or
 | |
|    NULL), pointing to *N characters of space.  It is realloc'ed as
 | |
|    necessary.  Returns the number of characters read (not including the
 | |
|    null terminator), or -1 on error or EOF.  */
 | |
| 
 | |
| _IO_ssize_t
 | |
| _IO_getdelim (lineptr, n, delimiter, fp)
 | |
|      char **lineptr;
 | |
|      _IO_size_t *n;
 | |
|      int delimiter;
 | |
|      _IO_FILE *fp;
 | |
| {
 | |
|   int result;
 | |
|   _IO_ssize_t cur_len = 0;
 | |
|   _IO_ssize_t len;
 | |
| 
 | |
|   if (lineptr == NULL || n == NULL)
 | |
|     {
 | |
|       MAYBE_SET_EINVAL;
 | |
|       return -1;
 | |
|     }
 | |
|   CHECK_FILE (fp, -1);
 | |
|   _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
 | |
|   _IO_flockfile (fp);
 | |
|   if (_IO_ferror_unlocked (fp))
 | |
|     {
 | |
|       result = -1;
 | |
|       goto unlock_return;
 | |
|     }
 | |
| 
 | |
|   if (*lineptr == NULL || *n == 0)
 | |
|     {
 | |
|       *n = 120;
 | |
|       *lineptr = (char *) malloc (*n);
 | |
|       if (*lineptr == NULL)
 | |
| 	{
 | |
| 	  result = -1;
 | |
| 	  goto unlock_return;
 | |
| 	}
 | |
|     }
 | |
| 
 | |
|   len = fp->_IO_read_end - fp->_IO_read_ptr;
 | |
|   if (len <= 0)
 | |
|     {
 | |
|       if (__underflow (fp) == EOF)
 | |
| 	{
 | |
| 	  result = -1;
 | |
| 	  goto unlock_return;
 | |
| 	}
 | |
|       len = fp->_IO_read_end - fp->_IO_read_ptr;
 | |
|     }
 | |
| 
 | |
|   for (;;)
 | |
|     {
 | |
|       _IO_size_t needed;
 | |
|       char *t;
 | |
|       t = (char *) memchr ((void *) fp->_IO_read_ptr, delimiter, len);
 | |
|       if (t != NULL)
 | |
| 	len = (t - fp->_IO_read_ptr) + 1;
 | |
|       /* Make enough space for len+1 (for final NUL) bytes.  */
 | |
|       needed = cur_len + len + 1;
 | |
|       if (needed > *n)
 | |
| 	{
 | |
| 	  if (needed < 2 * *n)
 | |
| 	    needed = 2 * *n;  /* Be generous. */
 | |
| 	  *n = needed;
 | |
| 	  *lineptr = (char *) realloc (*lineptr, needed);
 | |
| 	  if (*lineptr == NULL)
 | |
| 	    {
 | |
| 	      result = -1;
 | |
| 	      goto unlock_return;
 | |
| 	    }
 | |
| 	}
 | |
|       memcpy (*lineptr + cur_len, (void *) fp->_IO_read_ptr, len);
 | |
|       fp->_IO_read_ptr += len;
 | |
|       cur_len += len;
 | |
|       if (t != NULL || __underflow (fp) == EOF)
 | |
| 	break;
 | |
|       len = fp->_IO_read_end - fp->_IO_read_ptr;
 | |
|     }
 | |
|   (*lineptr)[cur_len] = '\0';
 | |
|   result = cur_len;
 | |
| 
 | |
| unlock_return:
 | |
|   _IO_funlockfile (fp);
 | |
|   _IO_cleanup_region_end (0);
 | |
|   return result;
 | |
| }
 | |
| 
 | |
| #ifdef weak_alias
 | |
| weak_alias (_IO_getdelim, __getdelim)
 | |
| weak_alias (_IO_getdelim, getdelim)
 | |
| #endif
 |