chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: create a loopback btrfs file system for /var/lib/machines, if necessary
[elogind.git]
/
src
/
libsystemd-terminal
/
modeset.c
diff --git
a/src/libsystemd-terminal/modeset.c
b/src/libsystemd-terminal/modeset.c
index f5be38e4fa1e49d927707b74cc15485db7f71e03..cccaabaa0622037de627e1795861872c5abb2271 100644
(file)
--- a/
src/libsystemd-terminal/modeset.c
+++ b/
src/libsystemd-terminal/modeset.c
@@
-30,11
+30,9
@@
#include <errno.h>
#include <getopt.h>
#include <linux/kd.h>
#include <errno.h>
#include <getopt.h>
#include <linux/kd.h>
-#include <linux/vt.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <systemd/sd-bus.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <systemd/sd-bus.h>
@@
-43,10
+41,7
@@
#include <termios.h>
#include <unistd.h>
#include "build.h"
#include <termios.h>
#include <unistd.h>
#include "build.h"
-#include "bus-util.h"
-#include "event-util.h"
#include "grdev.h"
#include "grdev.h"
-#include "grdev-internal.h"
#include "macro.h"
#include "sysview.h"
#include "util.h"
#include "macro.h"
#include "sysview.h"
#include "util.h"
@@
-146,16
+141,12
@@
static int modeset_new(Modeset **out) {
return log_oom();
r = sd_pid_get_session(getpid(), &m->session);
return log_oom();
r = sd_pid_get_session(getpid(), &m->session);
- if (r < 0) {
- log_error("Cannot retrieve logind session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot retrieve logind session: %m");
r = sd_session_get_seat(m->session, &m->seat);
r = sd_session_get_seat(m->session, &m->seat);
- if (r < 0) {
- log_error("Cannot retrieve seat of logind session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot retrieve seat of logind session: %m");
m->my_tty = is_my_tty(m->session);
m->managed = m->my_tty && geteuid() > 0;
m->my_tty = is_my_tty(m->session);
m->managed = m->my_tty && geteuid() > 0;
@@
-309,17
+300,13
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
name,
modeset_grdev_fn,
m);
name,
modeset_grdev_fn,
m);
- if (r < 0) {
- log_error("Cannot create grdev session: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot create grdev session: %m");
if (m->managed) {
r = sysview_session_take_control(ev->session_add.session);
if (m->managed) {
r = sysview_session_take_control(ev->session_add.session);
- if (r < 0) {
- log_error("Cannot request session control: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot request session control: %m");
}
grdev_session_enable(m->grdev_session);
}
grdev_session_enable(m->grdev_session);
@@
-358,16
+345,12
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
- if (r < 0) {
- log_error("Cannot acquire session control: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot acquire session control: %m");
r = ioctl(1, KDSKBMODE, K_UNICODE);
r = ioctl(1, KDSKBMODE, K_UNICODE);
- if (r < 0) {
- log_error("Cannot set K_UNICODE on stdout: %m");
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "Cannot set K_UNICODE on stdout: %m");
break;
}
break;
}
@@
-480,7
+463,7
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
-
srand(time(NULL)
);
+
initialize_srand(
);
r = parse_argv(argc, argv);
if (r <= 0)
r = parse_argv(argc, argv);
if (r <= 0)