chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for building elogind against musl libc
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 8b329abd793f39988aea17c527a58338b91d4256..cfae186edd615c5c8e4e3c799acca50f3aaa8c26 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;
@@
-86,11
+86,11
@@
int inhibitor_save(Inhibitor *i) {
r = mkdir_safe_label("/run/systemd/inhibit", 0755, 0, 0);
if (r < 0)
r = mkdir_safe_label("/run/systemd/inhibit", 0755, 0, 0);
if (r < 0)
- goto f
inish
;
+ goto f
ail
;
r = fopen_temporary(i->state_file, &f, &temp_path);
if (r < 0)
r = fopen_temporary(i->state_file, &f, &temp_path);
if (r < 0)
- goto f
inish
;
+ goto f
ail
;
fchmod(fileno(f), 0644);
fchmod(fileno(f), 0644);
@@
-109,38
+109,47
@@
int inhibitor_save(Inhibitor *i) {
_cleanup_free_ char *cc = NULL;
cc = cescape(i->who);
_cleanup_free_ char *cc = NULL;
cc = cescape(i->who);
- if (!cc)
+ if (!cc)
{
r = -ENOMEM;
r = -ENOMEM;
- else
- fprintf(f, "WHO=%s\n", cc);
+ goto fail;
+ }
+
+ fprintf(f, "WHO=%s\n", cc);
}
if (i->why) {
_cleanup_free_ char *cc = NULL;
cc = cescape(i->why);
}
if (i->why) {
_cleanup_free_ char *cc = NULL;
cc = cescape(i->why);
- if (!cc)
+ if (!cc)
{
r = -ENOMEM;
r = -ENOMEM;
- else
- fprintf(f, "WHY=%s\n", cc);
+ goto fail;
+ }
+
+ fprintf(f, "WHY=%s\n", cc);
}
if (i->fifo_path)
fprintf(f, "FIFO=%s\n", i->fifo_path);
}
if (i->fifo_path)
fprintf(f, "FIFO=%s\n", i->fifo_path);
- fflush(f);
+ r = fflush_and_check(f);
+ if (r < 0)
+ goto fail;
- if (
ferror(f) ||
rename(temp_path, i->state_file) < 0) {
+ if (rename(temp_path, i->state_file) < 0) {
r = -errno;
r = -errno;
- unlink(i->state_file);
- unlink(temp_path);
+ goto fail;
}
}
-finish:
- if (r < 0)
- log_error("Failed to save inhibit data %s: %s", i->state_file, strerror(-r));
+ return 0;
- return r;
+fail:
+ (void) unlink(i->state_file);
+
+ if (temp_path)
+ (void) unlink(temp_path);
+
+ return log_error_errno(r, "Failed to save inhibit data %s: %m", i->state_file);
}
int inhibitor_start(Inhibitor *i) {
}
int inhibitor_start(Inhibitor *i) {
@@
-151,9
+160,9
@@
int inhibitor_start(Inhibitor *i) {
dual_timestamp_get(&i->since);
dual_timestamp_get(&i->since);
- log_debug("Inhibitor %s (%s) pid=
%lu uid=%lu
mode=%s started.",
+ log_debug("Inhibitor %s (%s) pid=
"PID_FMT" uid="UID_FMT"
mode=%s started.",
strna(i->who), strna(i->why),
strna(i->who), strna(i->why),
-
(unsigned long) i->pid, (unsigned long)
i->uid,
+
i->pid,
i->uid,
inhibit_mode_to_string(i->mode));
inhibitor_save(i);
inhibit_mode_to_string(i->mode));
inhibitor_save(i);
@@
-169,9
+178,9
@@
int inhibitor_stop(Inhibitor *i) {
assert(i);
if (i->started)
assert(i);
if (i->started)
- log_debug("Inhibitor %s (%s) pid=
%lu uid=%lu
mode=%s stopped.",
+ log_debug("Inhibitor %s (%s) pid=
"PID_FMT" uid="UID_FMT"
mode=%s stopped.",
strna(i->who), strna(i->why),
strna(i->who), strna(i->why),
-
(unsigned long) i->pid, (unsigned long)
i->uid,
+
i->pid,
i->uid,
inhibit_mode_to_string(i->mode));
if (i->state_file)
inhibit_mode_to_string(i->mode));
if (i->state_file)
@@
-232,18
+241,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
+380,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
+448,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;