From: Mark Kettenis <kettenis@gnu.org>
Date: Fri, 7 Nov 2003 16:30:26 +0000 (+0000)
Subject: * fbsd-proc.c (read_mapping): Use sscanf and fgets instead of
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1763fba4a3d212192c2b37dbd016a4e91c952247;p=binutils-gdb.git

* fbsd-proc.c (read_mapping): Use sscanf and fgets instead of
fscanf.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 259ac8a9141..7f69024e5c0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-07  Mark Kettenis  <kettenis@gnu.org>
+
+	* fbsd-proc.c (read_mapping): Use sscanf and fgets instead of
+	fscanf.
+
 2003-11-07  Mark Kettenis  <kettenis@gnu.org>
 
 	* fbsd-proc.c: Fix formatting.
diff --git a/gdb/fbsd-proc.c b/gdb/fbsd-proc.c
index 07272b19863..16813a9a1c8 100644
--- a/gdb/fbsd-proc.c
+++ b/gdb/fbsd-proc.c
@@ -52,20 +52,19 @@ static int
 read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end,
 	      char *protection)
 {
+  /* FreeBSD 5.1-RELEASE uses a 256-byte buffer.  */
+  char buf[256];
   int resident, privateresident;
   unsigned long obj;
-  int ref_count, shadow_count;
-  unsigned flags;
-  char cow[5], access[4];
-  char type[8];
-  int ret;
-
-  /* The layout is described in /usr/src/miscfs/procfs/procfs_map.c.  */
-  ret = fscanf (mapfile, "%lx %lx %d %d %lx %s %d %d %x %s %s %s\n",
-		start, end,
-		&resident, &privateresident, &obj,
-		protection,
-		&ref_count, &shadow_count, &flags, cow, access, type);
+  int ret = EOF;
+
+  /* As of FreeBSD 5.0-RELEASE, the layout is described in
+     /usr/src/sys/fs/procfs/procfs_map.c.  Somewhere in 5.1-CURRENT a
+     new column was added to the procfs map.  Therefore we can't use
+     fscanf since we need to support older releases too.  */
+  if (fgets (buf, sizeof buf, mapfile) != NULL)
+    ret = sscanf (buf, "%lx %lx %d %d %lx %s", start, end,
+		  &resident, &privateresident, &obj, protection);
 
   return (ret != 0 && ret != EOF);
 }