From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Wed, 7 Apr 2021 09:47:14 +0000 (+0100)
Subject: coredump: use path_equal_filename helper
X-Git-Tag: v249-rc1~463^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=289784a798306b02b68b9d82c772225848a63515;p=thirdparty%2Fsystemd.git

coredump: use path_equal_filename helper
---

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index d5b079a53be..e55fbaa9083 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -796,20 +796,10 @@ log:
         }
 
         JSON_VARIANT_OBJECT_FOREACH(module_name, module_json, json_metadata) {
-                _cleanup_free_ char *module_basename = NULL, *exe_basename = NULL;
                 JsonVariant *package_name, *package_version;
 
-                /* The module name, most likely parsed from the ELF core file,
-                 * sometimes contains the full path and sometimes does not. */
-                r = path_extract_filename(module_name, &module_basename);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse module basename: %m");
-                r = path_extract_filename(context->meta[META_EXE], &exe_basename);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse executable basename: %m");
-
                 /* We only add structured fields for the 'main' ELF module */
-                if (!streq(module_basename, exe_basename))
+                if (!path_equal_filename(module_name, context->meta[META_EXE]))
                         continue;
 
                 package_name = json_variant_by_key(module_json, "package");
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index dffb92981b1..02bad966c1c 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -736,24 +736,10 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
                         JsonVariant *module_json;
 
                         JSON_VARIANT_OBJECT_FOREACH(module_name, module_json, v) {
-                                _cleanup_free_ char *module_basename = NULL, *exe_basename = NULL;
                                 JsonVariant *build_id;
 
-                                /* The module name, most likely parsed from the ELF core file,
-                                 * sometimes contains the full path and sometimes does not. */
-                                r = path_extract_filename(module_name, &module_basename);
-                                if (r < 0) {
-                                        log_warning_errno(r, "Failed to parse module basename: %m");
-                                        break;
-                                }
-                                r = path_extract_filename(exe, &exe_basename);
-                                if (r < 0) {
-                                        log_warning_errno(r, "Failed to parse executable basename: %m");
-                                        break;
-                                }
-
                                 /* We only print the build-id for the 'main' ELF module */
-                                if (!streq(module_basename, exe_basename))
+                                if (!path_equal_filename(module_name, exe))
                                         continue;
 
                                 build_id = json_variant_by_key(module_json, "buildId");