* fbsd-nat.c: Include <sys/sysctl.h>.

(fbsd_pid_to_exec_file): Use KERN_PROC_PATHNAME sysctl if
available.  Plug memory leak.  Fixes PR gdb/1922.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35479b081bdda38a2bd5e1ef0fc92dc3bc4824e4..c2208572d4cc2c46f811f504003666afb2a48e63 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-01  Mark Kettenis  <kettenis@gnu.org>
+
+       * fbsd-nat.c: Include <sys/sysctl.h>.
+       (fbsd_pid_to_exec_file): Use KERN_PROC_PATHNAME sysctl if
+       available.  Plug memory leak.  Fixes PR gdb/1922.
+
 2005-04-29  Mark Kettenis  <kettenis@gnu.org>
 
        * solist.h (TARGET_SO_FREE_SO, TARGET_SO_CLEAR_SOLIB) 

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 2b19f706d499bc131fecc68a4dae696f3c2f710a..05d00b5e9c4870c520ad0ba05b7b23b15da82b5b 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -27,8 +27,9 @@
 
 #include "gdb_assert.h"
 #include "gdb_string.h"
-#include <sys/procfs.h>
 #include <sys/types.h>
+#include <sys/procfs.h>
+#include <sys/sysctl.h>
 
 #include "elf-bfd.h"
 #include "fbsd-nat.h"
@@ -39,18 +40,30 @@
 char *
 fbsd_pid_to_exec_file (int pid)
 {
+  size_t len = MAXPATHLEN;
+  char *buf = xcalloc (len, sizeof (char));
   char *path;
-  char *buf;
 
-  path = xstrprintf ("/proc/%d/file", pid);
-  buf = xcalloc (MAXPATHLEN, sizeof (char));
-  make_cleanup (xfree, path);
-  make_cleanup (xfree, buf);
+#ifdef KERN_PROC_PATHNAME
+  int mib[4];
 
-  if (readlink (path, buf, MAXPATHLEN) > 0)
+  mib[0] = CTL_KERN;
+  mib[1] = KERN_PROC;
+  mib[2] = KERN_PROC_PATHNAME;
+  mib[3] = pid;
+  if (sysctl (mib, 4, buf, &len, NULL, 0) == 0)
     return buf;
+#endif
+
+  path = xstrprintf ("/proc/%d/file", pid);
+  if (readlink (path, buf, MAXPATHLEN) == -1)
+    {
+      xfree (buf);
+      buf = NULL;
+    }
 
-  return NULL;
+  xfree (path);
+  return buf;
 }
 
 static int