chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared/utf8: merge implementations, remove cruft
[elogind.git]
/
src
/
shared
/
dbus-common.c
diff --git
a/src/shared/dbus-common.c
b/src/shared/dbus-common.c
index 0e38933d8abba49a65463ad6b46ffa4c6d186375..c727cae7cd3c2fdb259dad9629d52e4a08803172 100644
(file)
--- a/
src/shared/dbus-common.c
+++ b/
src/shared/dbus-common.c
@@
-178,9
+178,9
@@
int bus_connect_system_ssh(const char *user, const char *host, DBusConnection **
assert(user || host);
if (user && host)
assert(user || host);
if (user && host)
- asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s
@
%s,argv3=systemd-stdio-bridge", user, host);
+ asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s
%%40
%s,argv3=systemd-stdio-bridge", user, host);
else if (user)
else if (user)
- asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s
@
localhost,argv3=systemd-stdio-bridge", user);
+ asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s
%%40
localhost,argv3=systemd-stdio-bridge", user);
else if (host)
asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
else if (host)
asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
@@
-258,12
+258,11
@@
const char *bus_error_message(const DBusError *error) {
return error->message;
}
return error->message;
}
-const char *bus_error_message_or_strerror(const DBusError *error, int err) {
-
+const char *bus_error(const DBusError *error, int err) {
if (error && dbus_error_is_set(error))
return bus_error_message(error);
if (error && dbus_error_is_set(error))
return bus_error_message(error);
- return strerror(err);
+ return strerror(err
< 0 ? -err : err
);
}
DBusHandlerResult bus_default_message_handler(
}
DBusHandlerResult bus_default_message_handler(
@@
-1097,7
+1096,7
@@
int generic_print_property(const char *name, DBusMessageIter *iter, bool all) {
} else if (strstr(name, "USec")) {
char timespan[FORMAT_TIMESPAN_MAX];
} else if (strstr(name, "USec")) {
char timespan[FORMAT_TIMESPAN_MAX];
- printf("%s=%s\n", name, format_timespan(timespan, sizeof(timespan), u));
+ printf("%s=%s\n", name, format_timespan(timespan, sizeof(timespan), u
, 0
));
} else
printf("%s=%llu\n", name, (unsigned long long) u);
} else
printf("%s=%llu\n", name, (unsigned long long) u);
@@
-1384,6
+1383,8
@@
int bus_method_call_with_reply(
r = -EACCES;
else if (dbus_error_has_name(&error, DBUS_ERROR_NO_REPLY))
r = -ETIMEDOUT;
r = -EACCES;
else if (dbus_error_has_name(&error, DBUS_ERROR_NO_REPLY))
r = -ETIMEDOUT;
+ else if (dbus_error_has_name(&error, DBUS_ERROR_DISCONNECTED))
+ r = -ECONNRESET;
else
r = -EIO;
goto finish;
else
r = -EIO;
goto finish;