]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
stdio-bridge: Correctly propagate error 2764/head
authorBenjamin Robin <dev@benjarobin.fr>
Mon, 29 Feb 2016 09:36:11 +0000 (10:36 +0100)
committerBenjamin ROBIN <dev@benjarobin.fr>
Mon, 29 Feb 2016 09:45:34 +0000 (10:45 +0100)
Return EXIT_FAILURE and print the correct errno code if sd_bus_get_fd() or sd_bus_get_events() fail

src/stdio-bridge/stdio-bridge.c

index 85b99ce161ee9ba9d32d7cca2e3675e399e0871c..ce8efce3d533e9c25bf3a970740f402b1f0054b6 100644 (file)
@@ -234,12 +234,14 @@ int main(int argc, char *argv[]) {
 
                 fd = sd_bus_get_fd(a);
                 if (fd < 0) {
+                        r = fd;
                         log_error_errno(r, "Failed to get fd: %m");
                         goto finish;
                 }
 
                 events_a = sd_bus_get_events(a);
                 if (events_a < 0) {
+                        r = events_a;
                         log_error_errno(r, "Failed to get events mask: %m");
                         goto finish;
                 }
@@ -252,6 +254,7 @@ int main(int argc, char *argv[]) {
 
                 events_b = sd_bus_get_events(b);
                 if (events_b < 0) {
+                        r = events_b;
                         log_error_errno(r, "Failed to get events mask: %m");
                         goto finish;
                 }