diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 3 | ||||
| -rw-r--r-- | gdb/gdbserver/server.h | 3 | ||||
| -rw-r--r-- | gdb/gdbserver/win32-low.c | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 11ae9f3..4e7fe00 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,14 @@ 2013-07-01 Pedro Alves <palves@redhat.com> + * server.h: Include "pathmax.h". + * linux-low.c: Don't include sys/param.h. + (linux_pid_exe_is_elf_64_file): Use PATH_MAX instead of + MAXPATHLEN. + * win32-low.c: Don't include sys/param.h. + (win32_create_inferior): Use PATH_MAX instead of MAXPATHLEN. + +2013-07-01 Pedro Alves <palves@redhat.com> + * event-loop.c: Don't check HAVE_UNISTD_H before including <unistd.h>. * gdbreplay.c: Likewise. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index bb7298a..47ea76d 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -23,7 +23,6 @@ #include "gdb_wait.h" #include <stdio.h> -#include <sys/param.h> #include <sys/ptrace.h> #include "linux-ptrace.h" #include "linux-procfs.h" @@ -342,7 +341,7 @@ elf_64_file_p (const char *file, unsigned int *machine) int linux_pid_exe_is_elf_64_file (int pid, unsigned int *machine) { - char file[MAXPATHLEN]; + char file[PATH_MAX]; sprintf (file, "/proc/%d/exe", pid); return elf_64_file_p (file, machine); diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index c68c651..1a1d9b2 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -38,6 +38,9 @@ #endif #include <setjmp.h> +/* For gnulib's PATH_MAX. */ +#include "pathmax.h" + #ifdef HAVE_STRING_H #include <string.h> #endif diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index d1caa73..30fd1e7 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -32,7 +32,6 @@ #include <imagehlp.h> #include <tlhelp32.h> #include <psapi.h> -#include <sys/param.h> #include <process.h> #ifndef USE_WIN32API @@ -515,7 +514,7 @@ static int win32_create_inferior (char *program, char **program_args) { #ifndef USE_WIN32API - char real_path[MAXPATHLEN]; + char real_path[PATH_MAX]; char *orig_path, *new_path, *path_ptr; #endif BOOL ret; @@ -546,8 +545,7 @@ win32_create_inferior (char *program, char **program_args) cygwin_conv_path_list (CCP_POSIX_TO_WIN_A, path_ptr, new_path, size); setenv ("PATH", new_path, 1); } - cygwin_conv_path (CCP_POSIX_TO_WIN_A, program, real_path, - MAXPATHLEN); + cygwin_conv_path (CCP_POSIX_TO_WIN_A, program, real_path, PATH_MAX); program = real_path; #endif |