From 57c8a0c37e0a3576cefa74dce78b8fd17040aaf4 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 15 Sep 1999 04:35:58 +0000
Subject: [PATCH] Port to redhat6

git-svn-id: svn://10.0.0.236/trunk@47521 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/tools/leaky/ShowLibs.cpp  |  2 +-
 mozilla/tools/leaky/bfd.cpp       |  5 +++--
 mozilla/tools/leaky/leaky.cpp     | 12 ++++++++++--
 mozilla/tools/leaky/libmalloc.cpp |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mozilla/tools/leaky/ShowLibs.cpp b/mozilla/tools/leaky/ShowLibs.cpp
index 05e04c1e2ac..4e5b4ea54e4 100644
--- a/mozilla/tools/leaky/ShowLibs.cpp
+++ b/mozilla/tools/leaky/ShowLibs.cpp
@@ -24,7 +24,7 @@
 int main(int argc, char** argv)
 {
 #ifdef linux
-  link_map* map = _dl_loaded;
+  link_map* map = _r_debug.r_map;
   while (NULL != map) {
     printf("addr=%08x name=%s\n", map->l_addr, map->l_name);
     map = map->l_next;
diff --git a/mozilla/tools/leaky/bfd.cpp b/mozilla/tools/leaky/bfd.cpp
index a4c0624a1d2..2d067284093 100644
--- a/mozilla/tools/leaky/bfd.cpp
+++ b/mozilla/tools/leaky/bfd.cpp
@@ -70,8 +70,9 @@ void leaky::ReadSymbols(const char *aFileName, u_long aBaseAddress)
 //    if ((syminfo.type == 'T') || (syminfo.type == 't')) {
       const char* nm = bfd_asymbol_name(sym);
       if (nm) {
-	char* dnm = cplus_demangle(nm, 1);
-	sp->name = dnm ? dnm : strdup(nm);
+//	char* dnm = cplus_demangle(nm, 1);
+//	sp->name = dnm ? dnm : strdup(nm);
+	sp->name = strdup(nm);
 	sp->address = syminfo.value + aBaseAddress;
 	sp++;
 	if (sp >= last) {
diff --git a/mozilla/tools/leaky/leaky.cpp b/mozilla/tools/leaky/leaky.cpp
index cf01efbb730..6e53284c2c6 100644
--- a/mozilla/tools/leaky/leaky.cpp
+++ b/mozilla/tools/leaky/leaky.cpp
@@ -47,6 +47,10 @@ int main(int argc, char** argv)
 
 leaky::leaky()
 {
+    applicationName = NULL;
+    logFile = NULL;
+    progFile = NULL;
+
     treeOutput = FALSE;
     sortByFrequency = FALSE;
     dumpAll = FALSE;
@@ -56,7 +60,7 @@ leaky::leaky()
     stackDepth = 100000;
 
     fd = -1;
-    last = base = 0;
+    base = last = 0;
     buckets = DefaultBuckets;
     dict = 0;
 
@@ -64,11 +68,15 @@ leaky::leaky()
     reallocs = 0;
     frees = 0;
     totalMalloced = 0;
-    totalLeaked = 0;
     errors = 0;
+    totalLeaked = 0;
 
     sfd = -1;
     externalSymbols = 0;
+    usefulSymbols = 0;
+    numExternalSymbols = 0;
+    lowestSymbolAddr = 0;
+    highestSymbolAddr = 0;
 
     loadMap = NULL;
 }
diff --git a/mozilla/tools/leaky/libmalloc.cpp b/mozilla/tools/leaky/libmalloc.cpp
index 84fbf0e6b35..d8704d85f7b 100644
--- a/mozilla/tools/leaky/libmalloc.cpp
+++ b/mozilla/tools/leaky/libmalloc.cpp
@@ -90,7 +90,7 @@ static void DumpAddressMap()
   int mfd = open("malloc-map", O_CREAT|O_WRONLY|O_TRUNC, 0666);
   if (mfd >= 0) {
     malloc_map_entry mme;
-    link_map* map = _dl_loaded;
+    link_map* map = _r_debug.r_map;
     while (NULL != map) {
       if (0 != map->l_addr) {
 	mme.nameLen = strlen(map->l_name);