Automatic date update in version.in

[deliverable/binutils-gdb.git] / gprof / source.c

diff --git a/gprof/source.c b/gprof/source.c
index 496373e752f7849d7edf47ef66e5b6aad9b8fa9f..648276bf37677f2dce1147d6e70323ea64dda400 100644 (file)
--- a/gprof/source.c
+++ b/gprof/source.c
@@ -1,12 +1,12 @@
 /* source.c - Keep track of source files.
 
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 \f
 #include "gprof.h"
 #include "libiberty.h"
@@ -28,15 +28,14 @@
 #define EXT_ANNO "-ann"                /* Postfix of annotated files.  */
 
 /* Default option values.  */
-boolean create_annotation_files = false;
+bool create_annotation_files = false;
 
 Search_List src_search_list = {0, 0};
 Source_File *first_src_file = 0;
 
 
 Source_File *
-source_file_lookup_path (path)
-     const char *path;
+source_file_lookup_path (const char *path)
 {
   Source_File *sf;
 
@@ -63,8 +62,7 @@ source_file_lookup_path (path)
 
 
 Source_File *
-source_file_lookup_name (filename)
-     const char *filename;
+source_file_lookup_name (const char *filename)
 {
   const char *fname;
   Source_File *sf;
@@ -91,24 +89,22 @@ source_file_lookup_name (filename)
 
 
 FILE *
-annotate_source (sf, max_width, annote, arg)
-     Source_File *sf;
-     unsigned int max_width;
-     void (*annote) PARAMS ((char *, unsigned int, int, void *));
-     void *arg;
+annotate_source (Source_File *sf, unsigned int max_width,
+     void (*annote) (char *, unsigned int, int, void *),
+     void *arg)
 {
-  static boolean first_file = true;
+  static bool first_file = true;
   int i, line_num, nread;
-  boolean new_line;
+  bool new_line;
   char buf[8192];
-  char fname[PATH_MAX];
+  char *fname;
   char *annotation, *name_only;
   FILE *ifp, *ofp;
   Search_List_Elem *sle = src_search_list.head;
 
   /* Open input file.  If open fails, walk along search-list until
      open succeeds or reaching end of list.  */
-  strcpy (fname, sf->name);
+  fname = (char *) sf->name;
 
   if (IS_ABSOLUTE_PATH (sf->name))
     sle = 0;                   /* Don't use search list for absolute paths.  */
@@ -120,6 +116,8 @@ annotate_source (sf, max_width, annote, arg)
                             sf->name, fname));
 
       ifp = fopen (fname, FOPEN_RB);
+      if (fname != sf->name)
+       free (fname);
       if (ifp)
        break;
 
@@ -145,6 +143,8 @@ annotate_source (sf, max_width, annote, arg)
 
       if (sle)
        {
+         fname = xmalloc (strlen (sle->path) + 3
+                          + strlen (name_only ? name_only : sf->name));
          strcpy (fname, sle->path);
 #ifdef HAVE_DOS_BASED_FILE_SYSTEM
          /* d:foo is not the same thing as d:/foo!  */
@@ -195,6 +195,7 @@ annotate_source (sf, max_width, annote, arg)
       else
        filename = sf->name;
 
+      fname = xmalloc (strlen (filename) + strlen (EXT_ANNO) + 1);
       strcpy (fname, filename);
       strcat (fname, EXT_ANNO);
 #ifdef __MSDOS__
@@ -209,9 +210,9 @@ annotate_source (sf, max_width, annote, arg)
          {
            char *dot = strrchr (fname, '.');
 
-           if (dot)
-             *dot = '\0';
-           strcat (fname, ".ann");
+           if (!dot)
+             dot = fname + strlen (filename);
+           strcpy (dot, ".ann");
          }
       }
 #endif
@@ -220,8 +221,10 @@ annotate_source (sf, max_width, annote, arg)
       if (!ofp)
        {
          perror (fname);
+         free (fname);
          return 0;
        }
+      free (fname);
     }
 
   /* Print file names if output goes to stdout
@@ -241,7 +244,7 @@ annotate_source (sf, max_width, annote, arg)
       fprintf (ofp, _("*** File %s:\n"), sf->name);
     }
 
-  annotation = xmalloc (max_width + 1);
+  annotation = (char *) xmalloc (max_width + 1);
   line_num = 1;
   new_line = true;
 
@@ -254,7 +257,6 @@ annotate_source (sf, max_width, annote, arg)
              (*annote) (annotation, max_width, line_num, arg);
              fputs (annotation, ofp);
              ++line_num;
-             new_line = false;
            }
 
          new_line = (buf[i] == '\n');
@@ -263,5 +265,6 @@ annotate_source (sf, max_width, annote, arg)
     }
 
   free (annotation);
+  fclose (ifp);
   return ofp;
 }