This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMIT] Fix PR gdb/1922.


This makes sure gdb -p PID can find the executable on FreeBSD 6.0
without /proc mounted.  Tested on amd64-unknown-freebsd6.0 and
i386-unknown-freebsd4.11.

Committed,

Mark


Index: ChangeLog
from  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.

Index: fbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/fbsd-nat.c,v
retrieving revision 1.2
diff -u -p -r1.2 fbsd-nat.c
--- fbsd-nat.c 11 Feb 2005 04:05:47 -0000 1.2
+++ fbsd-nat.c 1 May 2005 09:58:55 -0000
@@ -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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]