diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | libio/iofdopen.c | 2 | ||||
| -rw-r--r-- | libio/iovdprintf.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/strcpy.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/execve.c | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getsysstats.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ptrace.c | 10 |
7 files changed, 33 insertions, 8 deletions
@@ -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 diff --git a/libio/iofdopen.c b/libio/iofdopen.c index dc89576..0a867f7 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -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); diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index f7d6433..a10b8b5 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -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; diff --git a/sysdeps/generic/strcpy.c b/sysdeps/generic/strcpy.c index 2317eba..c8e28c5 100644 --- a/sysdeps/generic/strcpy.c +++ b/sysdeps/generic/strcpy.c @@ -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; } diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c index 31277d0..bec268f 100644 --- a/sysdeps/unix/sysv/linux/execve.c +++ b/sysdeps/unix/sysv/linux/execve.c @@ -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); } diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index a4113ce..dce568c 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -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 diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c index 07d8795..c0792a1 100644 --- a/sysdeps/unix/sysv/linux/ptrace.c +++ b/sysdeps/unix/sysv/linux/ptrace.c @@ -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 |