diff options
Diffstat (limited to 'gprof')
| -rw-r--r-- | gprof/ChangeLog | 10 | ||||
| -rw-r--r-- | gprof/corefile.c | 4 | ||||
| -rw-r--r-- | gprof/gprof.h | 4 | ||||
| -rw-r--r-- | gprof/source.c | 17 | ||||
| -rw-r--r-- | gprof/utils.c | 8 |
5 files changed, 29 insertions, 14 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index c116901..6e97b43 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,13 @@ +2021-04-14 Alan Modra <amodra@gmail.com> + + PR 27716 + * gprof.h (PATH_MAX): Don't define. + * corefile.c (core_create_line_syms): Don't use PATH_MAX for initial + file name size. + * source.c (annotate_source): Malloc file name buffer. Always + trim off "-ann" when dos 8.3 annotate file matches original. + * utils.c (print_name_only): Malloc file name buffer. + 2021-04-05 Alan Modra <amodra@gmail.com> * configure.ac: Check for sys/time.h and setitimer. Don't invoke diff --git a/gprof/corefile.c b/gprof/corefile.c index 831d589..b5e716d 100644 --- a/gprof/corefile.c +++ b/gprof/corefile.c @@ -781,8 +781,8 @@ core_create_line_syms (void) Of course, this is rather slow and it would be better if BFD would provide an iterator for enumerating all line infos. */ - prev_name_len = PATH_MAX; - prev_filename_len = PATH_MAX; + prev_name_len = 1024; + prev_filename_len = 1024; prev_name = (char *) xmalloc (prev_name_len); prev_filename = (char *) xmalloc (prev_filename_len); ltab.len = 0; diff --git a/gprof/gprof.h b/gprof/gprof.h index 1c23dd8..1d8d896 100644 --- a/gprof/gprof.h +++ b/gprof/gprof.h @@ -54,10 +54,6 @@ /* AIX defines hz as a macro. */ #undef hz -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - #define A_OUTNAME "a.out" /* default core filename */ #define GMONNAME "gmon.out" /* default profile filename */ #define GMONSUM "gmon.sum" /* profile summary filename */ diff --git a/gprof/source.c b/gprof/source.c index e648a3a..648276b 100644 --- a/gprof/source.c +++ b/gprof/source.c @@ -97,14 +97,14 @@ annotate_source (Source_File *sf, unsigned int max_width, int i, line_num, nread; 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. */ @@ -116,6 +116,8 @@ annotate_source (Source_File *sf, unsigned int max_width, sf->name, fname)); ifp = fopen (fname, FOPEN_RB); + if (fname != sf->name) + free (fname); if (ifp) break; @@ -141,6 +143,8 @@ annotate_source (Source_File *sf, unsigned int max_width, 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! */ @@ -191,6 +195,7 @@ annotate_source (Source_File *sf, unsigned int max_width, else filename = sf->name; + fname = xmalloc (strlen (filename) + strlen (EXT_ANNO) + 1); strcpy (fname, filename); strcat (fname, EXT_ANNO); #ifdef __MSDOS__ @@ -205,9 +210,9 @@ annotate_source (Source_File *sf, unsigned int max_width, { char *dot = strrchr (fname, '.'); - if (dot) - *dot = '\0'; - strcat (fname, ".ann"); + if (!dot) + dot = fname + strlen (filename); + strcpy (dot, ".ann"); } } #endif @@ -216,8 +221,10 @@ annotate_source (Source_File *sf, unsigned int max_width, if (!ofp) { perror (fname); + free (fname); return 0; } + free (fname); } /* Print file names if output goes to stdout diff --git a/gprof/utils.c b/gprof/utils.c index 76bc57d..2c04895 100644 --- a/gprof/utils.c +++ b/gprof/utils.c @@ -43,9 +43,7 @@ int print_name_only (Sym *self) { const char *name = self->name; - const char *filename; char *demangled = 0; - char buf[PATH_MAX]; int size = 0; if (name) @@ -60,7 +58,9 @@ print_name_only (Sym *self) size = strlen (name); if ((line_granularity || inline_file_names) && self->file) { - filename = self->file->name; + const char *filename = self->file->name; + char *buf; + if (!print_path) { filename = strrchr (filename, '/'); @@ -73,6 +73,7 @@ print_name_only (Sym *self) filename = self->file->name; } } + buf = xmalloc (strlen (filename) + 8 + 20 + 16); if (line_granularity) { sprintf (buf, " (%s:%d @ %lx)", filename, self->line_num, @@ -84,6 +85,7 @@ print_name_only (Sym *self) } printf ("%s", buf); size += strlen (buf); + free (buf); } free (demangled); DBG (DFNDEBUG, printf ("{%d} ", self->cg.top_order)); |