AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-05 21:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* libio/iofdopen.c (_IO_new_fdopen): Pass _IO_FILE_plus pointer to

Browse Source 
_IO_file_attach. 
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
	* sysdeps/generic/strcpy.c (strcpy): Stifle unused-value warnings.
	* sysdeps/unix/sysv/linux/execve.c (__execve): Add const
	qualifiers.  Don't check NULL-terminator of argv & envp.
	* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Use
	unbounded pointer type in word-size assertion.
	* sysdeps/unix/sysv/linux/ptrace.c (ptrace): Add missing
	cases to stifle warnings.

	* libio/iofdopen.c (_IO_new_fdopen): Pass _IO_FILE_plus pointer to
	_IO_file_attach.
	* libio/iovdprintf.c (_IO_vdprintf): Likewise.
This commit is contained in:
Greg McGary 2000-07-17 22:31:56 +00:00
parent 4d928e8d7d
commit 14fa17ccec
7 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -15,6 +15,18 @@
* sysdeps/unix/sysv/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/powerpc/syscalls.list
* sysdeps/generic/strcpy.c (strcpy): Stifle unused-value warnings.
* sysdeps/unix/sysv/linux/execve.c (__execve): Add const
qualifiers. Don't check NULL-terminator of argv & envp.
* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Use
unbounded pointer type in word-size assertion.
* sysdeps/unix/sysv/linux/ptrace.c (ptrace): Add missing
cases to stifle warnings.
* libio/iofdopen.c (_IO_new_fdopen): Pass _IO_FILE_plus pointer to
_IO_file_attach.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
2000-07-17 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_open.c (__gconv_open): Initialize the __data

2
libio/iofdopen.c
View File

@ -128,7 +128,7 @@ _IO_new_fdopen (fd, mode)
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
if (_IO_file_attach (&new_f->fp.file, fd) == NULL)
if (_IO_file_attach ((_IO_FILE *) &new_f->fp, fd) == NULL)
{
_IO_un_link (&new_f->fp);
free (new_f);

2
libio/iovdprintf.c
View File

@ -48,7 +48,7 @@ _IO_vdprintf (d, format, arg)
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
if (_IO_file_attach (&tmpfil.file, d) == NULL)
if (_IO_file_attach ((_IO_FILE *) &tmpfil, d) == NULL)
{
_IO_un_link (&tmpfil);
return EOF;

4
sysdeps/generic/strcpy.c
View File

@ -42,8 +42,8 @@ strcpy (dest, src)
while (c != '\0');
n = s - src;
CHECK_BOUNDS_HIGH (src + n);
CHECK_BOUNDS_HIGH (dest + n);
(void) CHECK_BOUNDS_HIGH (src + n);
(void) CHECK_BOUNDS_HIGH (dest + n);
return dest;
}

9
sysdeps/unix/sysv/linux/execve.c
View File

@ -20,6 +20,7 @@
#include <unistd.h>
#include <sysdep.h>
#include <alloca.h>
#include <sys/syscall.h>
#include <bp-checks.h>
@ -41,7 +42,7 @@ __execve (file, argv, envp)
__pthread_kill_other_threads_np ();
#if __BOUNDED_POINTERS__
{
char **v;
char *const *v;
int i;
char *__unbounded *__unbounded ubp_argv;
char *__unbounded *__unbounded ubp_envp;
@ -51,15 +52,17 @@ __execve (file, argv, envp)
;
i = v - argv + 1;
ubp_argv = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_argv) * i);
for (v = argv, ubp_v = ubp_argv; i--; v++, ubp_v++)
for (v = argv, ubp_v = ubp_argv; --i; v++, ubp_v++)
*ubp_v = CHECK_STRING (*v);
*ubp_v = 0;
for (v = envp; *v; v++)
;
i = v - envp + 1;
ubp_envp = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_envp) * i);
for (v = envp, ubp_v = ubp_envp; i--; v++, ubp_v++)
for (v = envp, ubp_v = ubp_envp; --i; v++, ubp_v++)
*ubp_v = CHECK_STRING (*v);
*ubp_v = 0;
return INLINE_SYSCALL (execve, 3, CHECK_STRING (file), ubp_argv, ubp_envp);
}

2
sysdeps/unix/sysv/linux/getsysstats.c
View File

@ -79,7 +79,7 @@ get_proc_path (char *buffer, size_t bufsize)
return result;
/* Now store the copied value. But do it atomically. */
assert (sizeof (long int) == sizeof (void *));
assert (sizeof (long int) == sizeof (void *__unbounded));
if (compare_and_swap ((long int *) &mount_proc, (long int) 0,
(long int) copy_result) == 0)
/* Replacing the value failed. This means another thread was

10
sysdeps/unix/sysv/linux/ptrace.c
View File

@ -91,6 +91,16 @@ ptrace (enum __ptrace_request request, ...)
(void) CHECK_1 ((int *) data);
#endif
break;
case PTRACE_TRACEME:
case PTRACE_CONT:
case PTRACE_KILL:
case PTRACE_SINGLESTEP:
case PTRACE_ATTACH:
case PTRACE_DETACH:
case PTRACE_SYSCALL:
/* Neither `data' nor `addr' needs any checks. */
break;
};
#endif