X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcorefile.c;h=0ce23de46257a7c7bf9ba4295b50eaea08080ddc;hb=60318db6c5459d73ac6fa1ff6d44ca17d797a1aa;hp=605be8d33da1569edab9c2abc9b0bfa9cc7b58dc;hpb=261b8d0859fcd2ee7a43e1b3d2db6b2496bd6d61;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/corefile.c b/bfd/corefile.c
index 605be8d33d..0ce23de462 100644
--- a/bfd/corefile.c
+++ b/bfd/corefile.c
@@ -1,6 +1,5 @@
 /* Core file generic interface routines for BFD.
-   Copyright 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2003, 2005,
-   2007 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -136,31 +135,31 @@ core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 
 /*
 FUNCTION
-        generic_core_file_matches_executable_p
+	generic_core_file_matches_executable_p
 
 SYNOPSIS
-        bfd_boolean generic_core_file_matches_executable_p
-          (bfd *core_bfd, bfd *exec_bfd);
+	bfd_boolean generic_core_file_matches_executable_p
+	  (bfd *core_bfd, bfd *exec_bfd);
 
 DESCRIPTION
-        Return TRUE if the core file attached to @var{core_bfd}
-        was generated by a run of the executable file attached
-        to @var{exec_bfd}.  The match is based on executable
-        basenames only.
-
-        Note: When not able to determine the core file failing
-        command or the executable name, we still return TRUE even
-        though we're not sure that core file and executable match.
-        This is to avoid generating a false warning in situations
-        where we really don't know whether they match or not.
+	Return TRUE if the core file attached to @var{core_bfd}
+	was generated by a run of the executable file attached
+	to @var{exec_bfd}.  The match is based on executable
+	basenames only.
+
+	Note: When not able to determine the core file failing
+	command or the executable name, we still return TRUE even
+	though we're not sure that core file and executable match.
+	This is to avoid generating a false warning in situations
+	where we really don't know whether they match or not.
 */
 
 bfd_boolean
 generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
 {
-  char *exec;
-  char *core;
-  char *last_slash;
+  const char *exec;
+  const char *core;
+  const char *last_slash;
 
   if (exec_bfd == NULL || core_bfd == NULL)
     return TRUE;
@@ -169,8 +168,8 @@ generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
      of the const char * returned by bfd_core_file_failing_command to a
      non-const char *.  In this case, the assignement does not lead to
      breaking the const, as we're only reading the string.  */
-     
-  core = (char *) bfd_core_file_failing_command (core_bfd);
+
+  core = bfd_core_file_failing_command (core_bfd);
   if (core == NULL)
     return TRUE;
 
@@ -185,7 +184,7 @@ generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
   last_slash = strrchr (exec, '/');
   if (last_slash != NULL)
     exec = last_slash + 1;
-  
-  return strcmp (exec, core) == 0;
+
+  return filename_cmp (exec, core) == 0;
 }