Trim extra underscores.

tools/rb/fix-macosx-stack.pl

@@ -36,7 +36,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-# $Id: fix-macosx-stack.pl,v 1.4 2007/08/14 04:44:33 dbaron%dbaron.org Exp $
+# $Id: fix-macosx-stack.pl,v 1.5 2007/08/14 05:06:05 dbaron%dbaron.org Exp $
 #
 # This script processes the output of nsTraceRefcnt's Mac OS X stack
 # walking code.  This is useful for two things:
@@ -117,7 +117,13 @@ sub nmstruct_for($) {
             my ($addr, $ty, $rest) = ($_ =~ /^([0-9a-f ]{8}) (.) (.*)$/);
             $addr = hex($addr);
             if ($ty eq 't' || $ty eq 'T') {
-                add_info($nmstruct->{symbols}, $addr, $rest);
+                my $sym = $rest;
+                if ($ty eq 'T' && substr($sym, 0, 1) eq '_' &&
+                                  substr($sym, 1, 1) ne '_') {
+                    # Public symbols have an extra leading _
+                    $sym = substr($sym, 1);
+                }
+                add_info($nmstruct->{symbols}, $addr, $sym);
             } elsif ($ty eq '-') {
                 # nm gives us stabs debugging information
                 my ($n1, $n2, $ty2, $rest2) =