From fec8f23ad45cbddbf1d168bee18bf61fd4aaaba0 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Thu, 6 May 1999 13:22:34 +0000 Subject: [PATCH] Merge alpha fix from the stable branch. --- sysdeps/linux/procmap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sysdeps/linux/procmap.c b/sysdeps/linux/procmap.c index 7109f574..d77dd912 100644 --- a/sysdeps/linux/procmap.c +++ b/sysdeps/linux/procmap.c @@ -66,11 +66,15 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid) do { short dev_major, dev_minor; unsigned long start, end, offset, inode, perm; - char flags [5]; + char flags [5], *format; size_t size; - rv = fscanf (maps, - "%08lx-%08lx %4c\n %08lx %02hx:%02hx %ld", + if (sizeof (void*) == 8) + format = "%16lx-%16lx %4c\n %16lx %02hx:%02hx %ld"; + else + format = "%08lx-%08lx %4c\n %08lx %02hx:%02hx %ld"; + + rv = fscanf (maps, format, &start, &end, flags, &offset, &dev_major, &dev_minor, &inode);