SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coredump: use path_equal_filename helper

Browse Source
This commit is contained in:
Luca Boccassi
2021-04-07 14:03:49 +01:00
parent 727e63e33e
commit 289784a798
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coredump/coredump.c
+1 -11
View File
@@ -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");
src/coredump/coredumpctl.c
+1 -15
View File
@@ -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");