* elflink.c (_bfd_elf_link_assign_sym_version): Improve error

[deliverable/binutils-gdb.git] / gdb / fbsd-nat.c

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index b7045d493e2dd1856caa0c04d282b943b2081f0c..cef15ccbf75577add9dae8bd65cd64ef6f40b028 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for FreeBSD.
 
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -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
@@ -93,7 +106,7 @@ fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
   mapfilename = xstrprintf ("/proc/%ld/map", (long) pid);
   mapfile = fopen (mapfilename, "r");
   if (mapfile == NULL)
-    error ("Couldn't open %s\n", mapfilename);
+    error (_("Couldn't open %s."), mapfilename);
 
   if (info_verbose)
     fprintf_filtered (gdb_stdout, 
@@ -133,7 +146,7 @@ char *
 fbsd_make_corefile_notes (bfd *obfd, int *note_size)
 {
   struct gdbarch *gdbarch = current_gdbarch;
-  const struct regcache *regcache = current_regcache;
+  const struct regcache *regcache = get_current_regcache ();
   gregset_t gregs;
   fpregset_t fpregs;
   char *note_data = NULL;