[1/2] gprofng: fix typos in get_realpath() and check_executable()

Message ID 20230810184828.3014191-1-vladimir.mezentsev@oracle.com
State Accepted
Headers
Series [1/2] gprofng: fix typos in get_realpath() and check_executable() |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Vladimir Mezentsev Aug. 10, 2023, 6:48 p.m. UTC
  From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

gprofng/ChangeLog
2023-08-09  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

	* src/Application.cc (Application::get_realpath): Fix typo.
	* src/checks.cc (collect::check_executable): Likewise.
---
 gprofng/src/Application.cc | 3 ++-
 gprofng/src/checks.cc      | 9 ++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
  

Patch

diff --git a/gprofng/src/Application.cc b/gprofng/src/Application.cc
index 84660646263..07e93c46945 100644
--- a/gprofng/src/Application.cc
+++ b/gprofng/src/Application.cc
@@ -100,7 +100,8 @@  Application::get_realpath (const char *_name)
 	    {
 	      if (path != s)
 		{
-		  char *nm = dbe_sprintf (NTXT ("%.*s/%s"), (int) (path - s - 1), path, _name);
+		  char *nm = dbe_sprintf (NTXT ("%.*s/%s"), (int) (s - path),
+				   path, _name);
 		  exe_name = realpath (nm, NULL);
 		  free (nm);
 		  if (exe_name)
diff --git a/gprofng/src/checks.cc b/gprofng/src/checks.cc
index 4524611956d..094c3bbc60a 100644
--- a/gprofng/src/checks.cc
+++ b/gprofng/src/checks.cc
@@ -261,7 +261,7 @@  collect::check_executable (char *target_name)
     {
       // not found, look on path
       char *exe_name = get_realpath (target_name);
-      if (access (exe_name, X_OK) == 0)
+      if (access (exe_name, X_OK) != 0)
 	{
 	  // target can't be located
 	  // one last attempt: append .class to name, and see if we can find it
@@ -293,13 +293,8 @@  collect::check_executable (char *target_name)
     return EXEC_OK;
   // do not by pass checking architectural match
   collect::Exec_status exec_stat = check_executable_arch (elf);
-  if (exec_stat != EXEC_OK)
-    {
-      delete elf;
-      return exec_stat;
-    }
   delete elf;
-  return EXEC_OK;
+  return exec_stat;
 }
 
 collect::Exec_status