From e15197c8040b9e985a6164f13947dae881d792d8 Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Wed, 9 Aug 2023 19:18:58 -0700 Subject: gprofng: fix typos in get_realpath() and check_executable() gprofng/ChangeLog 2023-08-09 Vladimir Mezentsev * 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(-) diff --git a/gprofng/src/Application.cc b/gprofng/src/Application.cc index 8466064..07e93c4 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 4524611..094c3bb 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 -- cgit v1.1