AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wed Nov 29 12:30:50 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* libio/vsnprintf.c (__vsnprintf): Define as alias.
	* libio/iovsscanf.c (__vsscanf): Define as alias.
	* asprintf.c: Remove libio adaptation code added by drepper.
	* dprintf.c: Likewise.
	* printf.c: Likewise.
	* scanf.c: Likewise.
	* snprintf.c: Likewise.
	* sprintf.c: Likewise.
	* sscanf.c: Likewise.
	* vprintf.c: Likewise.
	* stdio-common/vfscanf.c [USE_IN_LIBIO] (__vfscanf): New wrapper
	function.
	(vfscanf): Define unconditionally.

	* sysdeps/i386/dl-machine.h (elf_machine_rel): If SYM is null, use
	zero for value.

	* misc/getpass.c: Write a newline after reading the unechoed
	password.
This commit is contained in:
Roland McGrath 1995-11-30 04:49:04 +00:00
parent b7843ea9ff
commit b2518f55c0
14 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
Wed Nov 29 12:30:50 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* libio/vsnprintf.c (__vsnprintf): Define as alias.
* libio/iovsscanf.c (__vsscanf): Define as alias.
* asprintf.c: Remove libio adaptation code added by drepper.
* dprintf.c: Likewise.
* printf.c: Likewise.
* scanf.c: Likewise.
* snprintf.c: Likewise.
* sprintf.c: Likewise.
* sscanf.c: Likewise.
* vprintf.c: Likewise.
* stdio-common/vfscanf.c [USE_IN_LIBIO] (__vfscanf): New wrapper
function.
(vfscanf): Define unconditionally.
* sysdeps/i386/dl-machine.h (elf_machine_rel): If SYM is null, use
zero for value.
* misc/getpass.c: Write a newline after reading the unechoed
password.
Mon Nov 27 19:24:18 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/Makefile (routines): Add getsid.

1
libio/iovsscanf.c
View File

@ -35,4 +35,5 @@ DEFUN(_IO_vsscanf, (string, format, args),
_IO_str_init_static ((_IO_FILE*)&sf, (char*)string, 0, NULL);
return _IO_vfscanf((_IO_FILE*)&sf, format, args, NULL);
}
weak_alias (_IO_vsscanf, __vsscanf)
weak_alias (_IO_vsscanf, vsscanf)

1
libio/vsnprintf.c
View File

@ -41,4 +41,5 @@ _IO_vsnprintf (string, maxlen, format, args)
*((_IO_FILE *) &sf)->_IO_write_ptr = '\0';
return ret;
}
weak_alias (_IO_vsnprintf, __vsnprintf)
weak_alias (_IO_vsnprintf, vsnprintf)

11
misc/getpass.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
/* Copyright (C) 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
@ -77,8 +77,13 @@ getpass (prompt)
if (nread < 0 && buf != NULL)
buf[0] = '\0';
else if (buf[nread - 1] == '\n')
/* Remove the newline. */
buf[nread - 1] = '\0';
{
/* Remove the newline. */
buf[nread - 1] = '\0';
if (echo_off)
/* Write the newline that was not echoed. */
putc ('\n', out);
}
/* Restore echoing. */
if (echo_off)

4
stdio-common/asprintf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define vasprintf _IO_vasprintf
#endif
/* Write formatted output from FORMAT to a string which is
allocated with malloc and stored in *STRING_PTR. */
/* VARARGS2 */

4
stdio-common/dprintf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define vdprintf _IO_vdprintf
#endif
/* Write formatted output to D, according to the format string FORMAT. */
/* VARARGS2 */
int

4
stdio-common/printf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define vprintf _IO_vprintf
#endif
/* Write formatted output to stdout from the format string FORMAT. */
/* VARARGS1 */
int

4
stdio-common/scanf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define vscanf _IO_vscanf
#endif
/* Read formatted input from stdin according to the format string FORMAT. */
/* VARARGS1 */
int

5
stdio-common/snprintf.c
View File

@ -19,11 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# include <libioP.h>
# define __vsnprintf _IO_vsnprintf
#endif
/* Write formatted output into S, according to the format
string FORMAT, writing no more than MAXLEN characters. */
/* VARARGS3 */

4
stdio-common/sprintf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define vsprintf _IO_vsprintf
#endif
/* Write formatted output into S, according to the format string FORMAT. */
/* VARARGS2 */
int

4
stdio-common/sscanf.c
View File

@ -19,10 +19,6 @@ Cambridge, MA 02139, USA. */
#include <stdarg.h>
#include <stdio.h>
#ifdef USE_IN_LIBIO
# define __vsscanf _IO_vsscanf
#endif
/* Read formatted input from S, according to the format string FORMAT. */
/* VARARGS2 */
int

10
stdio-common/vfscanf.c
View File

@ -724,6 +724,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
return ((c == EOF || ungetc (c, s)), done);
}
#ifndef USE_IN_LIBIO
weak_alias (__vfscanf, vfscanf)
#ifdef USE_IN_LIBIO
int
__vfscanf (FILE *s, const char *format, va_list argptr)
{
return _IO_vfscanf (s, format, argptr, NULL);
}
#endif
weak_alias (__vfscanf, vfscanf)

4
stdio-common/vprintf.c
View File

@ -22,10 +22,6 @@ Cambridge, MA 02139, USA. */
#undef vprintf
#ifdef USE_IN_LIBIO
# define vfprintf _IO_vfprintf
#endif
/* Write formatted output to stdout according to the
format string FORMAT, using the argument list in ARG. */
int

2
sysdeps/i386/dl-machine.h
View File

@ -77,7 +77,7 @@ elf_machine_rel (struct link_map *map,
Elf32_Addr sym_loadaddr, const Elf32_Sym *sym)
{
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
const Elf32_Addr sym_value = sym_loadaddr + sym->st_value;
const Elf32_Addr sym_value = sym ? sym_loadaddr + sym->st_value : 0;
switch (ELF32_R_TYPE (reloc->r_info))
{