Update FSF address

[external/binutils.git] / binutils / addr2line.c

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 1d09cd0..b4f48fc 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -1,5 +1,6 @@
 /* addr2line.c -- convert addresses to line number and function name
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
    Contributed by Ulrich Lauther <Ulrich.Lauther@mchp.siemens.de>
 
    This file is part of GNU Binutils.
@@ -16,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Derived from objdump.c and nm.c by Ulrich.Lauther@mchp.siemens.de
 
@@ -28,6 +29,7 @@
    both forms write results to stdout, the second form reads addresses
    to be converted from stdin.  */
 
+#include "config.h"
 #include <string.h>
 
 #include "bfd.h"
@@ -37,9 +39,9 @@
 #include "bucomm.h"
 #include "budemang.h"
 
-static boolean with_functions; /* -f, show function names.  */
-static boolean do_demangle;    /* -C, demangle names.  */
-static boolean base_names;     /* -s, strip directory names.  */
+static bfd_boolean with_functions;     /* -f, show function names.  */
+static bfd_boolean do_demangle;                /* -C, demangle names.  */
+static bfd_boolean base_names;         /* -s, strip directory names.  */
 
 static int naddr;              /* Number of addresses to process.  */
 static char **addr;            /* Hex addresses to process.  */
@@ -58,18 +60,16 @@ static struct option long_options[] =
   {0, no_argument, 0, 0}
 };
 
-static void usage PARAMS ((FILE *, int));
-static void slurp_symtab PARAMS ((bfd *));
-static void find_address_in_section PARAMS ((bfd *, asection *, PTR));
-static void translate_addresses PARAMS ((bfd *));
-static void process_file PARAMS ((const char *, const char *));
+static void usage (FILE *, int);
+static void slurp_symtab (bfd *);
+static void find_address_in_section (bfd *, asection *, void *);
+static void translate_addresses (bfd *);
+static void process_file (const char *, const char *);
 \f
 /* Print a usage message to STREAM and exit with STATUS.  */
 
 static void
-usage (stream, status)
-     FILE *stream;
-     int status;
+usage (FILE *stream, int status)
 {
   fprintf (stream, _("Usage: %s [option(s)] [addr(s)]\n"), program_name);
   fprintf (stream, _(" Convert addresses into line number/file name pairs.\n"));
@@ -93,8 +93,7 @@ usage (stream, status)
 /* Read in the symbol table.  */
 
 static void
-slurp_symtab (abfd)
-     bfd *abfd;
+slurp_symtab (bfd *abfd)
 {
   long symcount;
   unsigned int size;
@@ -102,9 +101,9 @@ slurp_symtab (abfd)
   if ((bfd_get_file_flags (abfd) & HAS_SYMS) == 0)
     return;
 
-  symcount = bfd_read_minisymbols (abfd, false, (PTR) &syms, &size);
+  symcount = bfd_read_minisymbols (abfd, FALSE, (void *) &syms, &size);
   if (symcount == 0)
-    symcount = bfd_read_minisymbols (abfd, true /* dynamic */, (PTR) &syms, &size);
+    symcount = bfd_read_minisymbols (abfd, TRUE /* dynamic */, (void *) &syms, &size);
 
   if (symcount < 0)
     bfd_fatal (bfd_get_filename (abfd));
@@ -117,16 +116,14 @@ static bfd_vma pc;
 static const char *filename;
 static const char *functionname;
 static unsigned int line;
-static boolean found;
+static bfd_boolean found;
 
 /* Look for an address in a section.  This is called via
    bfd_map_over_sections.  */
 
 static void
-find_address_in_section (abfd, section, data)
-     bfd *abfd;
-     asection *section;
-     PTR data ATTRIBUTE_UNUSED;
+find_address_in_section (bfd *abfd, asection *section,
+                        void *data ATTRIBUTE_UNUSED)
 {
   bfd_vma vma;
   bfd_size_type size;
@@ -141,7 +138,7 @@ find_address_in_section (abfd, section, data)
   if (pc < vma)
     return;
 
-  size = bfd_get_section_size_before_reloc (section);
+  size = bfd_get_section_size (section);
   if (pc >= vma + size)
     return;
 
@@ -153,8 +150,7 @@ find_address_in_section (abfd, section, data)
    file_name:line_number and optionally function name.  */
 
 static void
-translate_addresses (abfd)
-     bfd *abfd;
+translate_addresses (bfd *abfd)
 {
   int read_stdin = (naddr == 0);
 
@@ -176,8 +172,8 @@ translate_addresses (abfd)
          pc = bfd_scan_vma (*addr++, NULL, 16);
        }
 
-      found = false;
-      bfd_map_over_sections (abfd, find_address_in_section, (PTR) NULL);
+      found = FALSE;
+      bfd_map_over_sections (abfd, find_address_in_section, NULL);
 
       if (! found)
        {
@@ -230,13 +226,14 @@ translate_addresses (abfd)
 /* Process a file.  */
 
 static void
-process_file (file_name, target)
-     const char *file_name;
-     const char *target;
+process_file (const char *file_name, const char *target)
 {
   bfd *abfd;
   char **matching;
 
+  if (get_file_size (file_name) < 1)
+    return;
+
   abfd = bfd_openr (file_name, target);
   if (abfd == NULL)
     bfd_fatal (file_name);
@@ -268,12 +265,10 @@ process_file (file_name, target)
   bfd_close (abfd);
 }
 \f
-int main PARAMS ((int, char **));
+int main (int, char **);
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   const char *file_name;
   char *target;
@@ -307,7 +302,7 @@ main (argc, argv)
          target = optarg;
          break;
        case 'C':
-         do_demangle = true;
+         do_demangle = TRUE;
          if (optarg != NULL)
            {
              enum demangling_styles style;
@@ -324,10 +319,10 @@ main (argc, argv)
          file_name = optarg;
          break;
        case 's':
-         base_names = true;
+         base_names = TRUE;
          break;
        case 'f':
-         with_functions = true;
+         with_functions = TRUE;
          break;
        case 'v':
        case 'V':