chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: apply selinux label to XDG_RUNTIME_DIR
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 64a62ffeae6f51b0f3f86aed4e39aa6275621006..855c85402c17d5ee14a9feb0b441eeb73e18b352 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-26,9
+26,9
@@
#include "util.h"
#include "mkdir.h"
#include "util.h"
#include "mkdir.h"
-#include "path-util.h"
#include "logind-inhibit.h"
#include "fileio.h"
#include "logind-inhibit.h"
#include "fileio.h"
+#include "formats-util.h"
Inhibitor* inhibitor_new(Manager *m, const char* id) {
Inhibitor *i;
Inhibitor* inhibitor_new(Manager *m, const char* id) {
Inhibitor *i;
@@
-138,7
+138,7
@@
int inhibitor_save(Inhibitor *i) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error
("Failed to save inhibit data %s: %s", i->state_file, strerror(-r)
);
+ log_error
_errno(r, "Failed to save inhibit data %s: %m", i->state_file
);
return r;
}
return r;
}
@@
-232,18
+232,18
@@
int inhibitor_load(Inhibitor *i) {
}
if (who) {
}
if (who) {
-
cc = cunescape(who
);
- if (
!cc
)
- return
-ENOMEM
;
+
r = cunescape(who, 0, &cc
);
+ if (
r < 0
)
+ return
r
;
free(i->who);
i->who = cc;
}
if (why) {
free(i->who);
i->who = cc;
}
if (why) {
-
cc = cunescape(why
);
- if (
!cc
)
- return
-ENOMEM
;
+
r = cunescape(why, 0, &cc
);
+ if (
r < 0
)
+ return
r
;
free(i->why);
i->why = cc;
free(i->why);
i->why = cc;
@@
-371,7
+371,7
@@
bool manager_is_inhibited(
Inhibitor *i;
Iterator j;
Inhibitor *i;
Iterator j;
- struct dual_timestamp ts =
{ 0, 0 }
;
+ struct dual_timestamp ts =
DUAL_TIMESTAMP_NULL
;
bool inhibited = false;
assert(m);
bool inhibited = false;
assert(m);
@@
-439,23
+439,23
@@
const char *inhibit_what_to_string(InhibitWhat w) {
InhibitWhat inhibit_what_from_string(const char *s) {
InhibitWhat what = 0;
InhibitWhat inhibit_what_from_string(const char *s) {
InhibitWhat what = 0;
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
size_t l;
- FOREACH_WORD_SEPARATOR(w, l, s, ":", state) {
- if (l == 8 && strneq(w, "shutdown", l))
+ FOREACH_WORD_SEPARATOR(w
ord
, l, s, ":", state) {
+ if (l == 8 && strneq(w
ord
, "shutdown", l))
what |= INHIBIT_SHUTDOWN;
what |= INHIBIT_SHUTDOWN;
- else if (l == 5 && strneq(w, "sleep", l))
+ else if (l == 5 && strneq(w
ord
, "sleep", l))
what |= INHIBIT_SLEEP;
what |= INHIBIT_SLEEP;
- else if (l == 4 && strneq(w, "idle", l))
+ else if (l == 4 && strneq(w
ord
, "idle", l))
what |= INHIBIT_IDLE;
what |= INHIBIT_IDLE;
- else if (l == 16 && strneq(w, "handle-power-key", l))
+ else if (l == 16 && strneq(w
ord
, "handle-power-key", l))
what |= INHIBIT_HANDLE_POWER_KEY;
what |= INHIBIT_HANDLE_POWER_KEY;
- else if (l == 18 && strneq(w, "handle-suspend-key", l))
+ else if (l == 18 && strneq(w
ord
, "handle-suspend-key", l))
what |= INHIBIT_HANDLE_SUSPEND_KEY;
what |= INHIBIT_HANDLE_SUSPEND_KEY;
- else if (l == 20 && strneq(w, "handle-hibernate-key", l))
+ else if (l == 20 && strneq(w
ord
, "handle-hibernate-key", l))
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
- else if (l == 17 && strneq(w, "handle-lid-switch", l))
+ else if (l == 17 && strneq(w
ord
, "handle-lid-switch", l))
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;