diff options
author | Pedro Alves <palves@redhat.com> | 2013-07-01 11:28:30 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2013-07-01 11:28:30 +0000 |
commit | d8d2a3ee4770ba7eab50829dd1126f95ac33e5a6 (patch) | |
tree | 4e333e101ad974fb755ec5c8144264d256dc129a /gdb/linux-nat.c | |
parent | 38ec22075a7298fbe720aeda2b0c611964b67155 (diff) | |
download | gdb-d8d2a3ee4770ba7eab50829dd1126f95ac33e5a6.zip gdb-d8d2a3ee4770ba7eab50829dd1126f95ac33e5a6.tar.gz gdb-d8d2a3ee4770ba7eab50829dd1126f95ac33e5a6.tar.bz2 |
Normalize on PATH_MAX instead of MAXPATHLEN throughout.
With the pathmax gnulib module in place, we can use PATH_MAX
consistently throughout, instead of the current mixbag of PATH_MAX and
MAXPATHLEN uses. It's no longer necessary to include sys/param.h
(supposedly, I can't check all ports touched here) for MAXPATHLEN.
Don't remove sys/param.h from GDB's configure.ac, as later tests in
the file use HAVE_SYS_PARAM_H checks.
Tested on x86_64 Fedora 17.
Also cross-built for --host=i686-w64-mingw32, and --host=i586-pc-msdosdjgpp.
gdb/
2013-07-01 Pedro Alves <palves@redhat.com>
* defs.h: Include "pathmax.h".
* utils.c: Don't include sys/param.h.
(gdb_realpath): Remove code that checks for MAXPATHLEN.
* solib-ia64-hpux.c (ia64_hpux_handle_load_event): Use PATH_MAX
instead of MAXPATHLEN.
* solib-sunos.c: Don't include sys/param.h.
* xcoffread.c: Don't include sys/param.h.
* bsd-kvm.c: Don't include sys/param.h.
* darwin-nat.c: Don't include sys/param.h.
(darwin_pid_to_exec_file): Use PATH_MAX instead of MAXPATHLEN.
* darwin-nat-info.c: Don't include sys/param.h.
* fbsd-nat.c (fbsd_pid_to_exec_file): Use PATH_MAX instead of
MAXPATHLEN.
* i386obsd-nat.c: Don't include sys/param.h.
* inf-child.c: Don't include sys/param.h.
(inf_child_fileio_readlink): Use PATH_MAX instead of MAXPATHLEN.
* linux-fork.c: Don't include sys/param.h.
(fork_save_infrun_state): Use PATH_MAX instead of MAXPATHLEN.
* linux-nat.c: Don't include sys/param.h.
(linux_child_pid_to_exec_file, linux_proc_pending_signals)
(linux_proc_pending_signals): Use PATH_MAX instead of MAXPATHLEN.
* m68klinux-nat.c: Don't include sys/param.h.
* nbsd-nat.c: Don't include sys/param.h.
(nbsd_pid_to_exec_file): Use PATH_MAX instead of MAXPATHLEN.
* ppc-linux-nat.c: Don't include sys/param.h.
* rs6000-nat.c: Don't include sys/param.h.
* spu-linux-nat.c. Don't include sys/param.h.
* windows-nat.c: Don't include sys/param.h.
* xtensa-linux-nat.c: Don't include sys/param.h.
* config/i386/nm-fbsd.h: Don't include sys/param.h.
gdb/gdbserver/
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.
Diffstat (limited to 'gdb/linux-nat.c')
-rw-r--r-- | gdb/linux-nat.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 6ba71ba..45a6e5f 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -39,7 +39,6 @@ #include "inf-child.h" #include "inf-ptrace.h" #include "auxv.h" -#include <sys/param.h> /* for MAXPATHLEN */ #include <sys/procfs.h> /* for elf_gregset etc. */ #include "elf-bfd.h" /* for elfcore_write_* */ #include "gregset.h" /* for gregset */ @@ -4306,14 +4305,14 @@ linux_child_pid_to_exec_file (int pid) { char *name1, *name2; - name1 = xmalloc (MAXPATHLEN); - name2 = xmalloc (MAXPATHLEN); + name1 = xmalloc (PATH_MAX); + name2 = xmalloc (PATH_MAX); make_cleanup (xfree, name1); make_cleanup (xfree, name2); - memset (name2, 0, MAXPATHLEN); + memset (name2, 0, PATH_MAX); sprintf (name1, "/proc/%d/exe", pid); - if (readlink (name1, name2, MAXPATHLEN - 1) > 0) + if (readlink (name1, name2, PATH_MAX - 1) > 0) return name2; else return name1; @@ -4562,7 +4561,7 @@ linux_proc_pending_signals (int pid, sigset_t *pending, sigset_t *blocked, sigset_t *ignored) { FILE *procfile; - char buffer[MAXPATHLEN], fname[MAXPATHLEN]; + char buffer[PATH_MAX], fname[PATH_MAX]; struct cleanup *cleanup; sigemptyset (pending); @@ -4574,7 +4573,7 @@ linux_proc_pending_signals (int pid, sigset_t *pending, error (_("Could not open %s"), fname); cleanup = make_cleanup_fclose (procfile); - while (fgets (buffer, MAXPATHLEN, procfile) != NULL) + while (fgets (buffer, PATH_MAX, procfile) != NULL) { /* Normal queued signals are on the SigPnd line in the status file. However, 2.6 kernels also have a "shared" pending |