morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

varlinkctl: if returned error is an errno, print it as one in log message

Browse Source
This commit is contained in:
Lennart Poettering
2025-05-26 13:19:43 +02:00
committed by Yu Watanabe
parent 554d5882b7
commit bee59ab901
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/varlinkctl/varlinkctl.c
View File

@@ -532,8 +532,14 @@ static int reply_callback(
"Method call returned expected error: %s", error);
r = 0;
} else
r = *ret = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call failed: %s", error);
} else {
/* If we can translate this to an errno, let's print that as errno and return it, otherwise, return a generic error code */
r = sd_varlink_error_to_errno(error, parameters);
if (r != -EBADR)
*ret = log_error_errno(r, "Method call failed: %m");
else
r = *ret = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call failed: %s", error);
}
} else
r = 0;
@@ -626,8 +632,13 @@ static int verb_call(int argc, char *argv[], void *userdata) {
"Method call %s() returned expected error: %s", method, error);
r = 0;
} else
r = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call %s() failed: %s", method, error);
} else {
r = sd_varlink_error_to_errno(error, reply);
if (r != -EBADR)
log_error_errno(r, "Method call %s() failed: %m", method);
else
r = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call %s() failed: %s", method, error);
}
} else
r = 0;
@@ -706,8 +717,13 @@ static int verb_call(int argc, char *argv[], void *userdata) {
"Method call %s() returned expected error: %s", method, error);
r = 0;
} else
r = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call %s() failed: %s", method, error);
} else {
r = sd_varlink_error_to_errno(error, reply);
if (r != -EBADR)
log_error_errno(r, "Method call %s() failed: %m", method);
else
r = log_error_errno(SYNTHETIC_ERRNO(EBADE), "Method call %s() failed: %s", method, error);
}
} else
r = 0;