chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include <poll.h> instead of <sys/poll.h>
[elogind.git]
/
src
/
getty-generator
/
getty-generator.c
diff --git
a/src/getty-generator/getty-generator.c
b/src/getty-generator/getty-generator.c
index 35cd8589fcdb1f88df66b9ea4bf183e02a422bba..f8f5fb30c2433cae500cebb0b9164b19f0c4c230 100644
(file)
--- a/
src/getty-generator/getty-generator.c
+++ b/
src/getty-generator/getty-generator.c
@@
-41,8
+41,8
@@
static int add_symlink(const char *fservice, const char *tservice) {
assert(fservice);
assert(tservice);
assert(fservice);
assert(tservice);
- from = str
append
a(SYSTEM_DATA_UNIT_PATH "/", fservice);
- to = str
appenda3
(arg_dest, "/getty.target.wants/", tservice);
+ from = str
join
a(SYSTEM_DATA_UNIT_PATH "/", fservice);
+ to = str
joina
(arg_dest, "/getty.target.wants/", tservice);
mkdir_parents_label(to, 0755);
mkdir_parents_label(to, 0755);
@@
-52,7
+52,7
@@
static int add_symlink(const char *fservice, const char *tservice) {
/* In case console=hvc0 is passed this will very likely result in EEXIST */
return 0;
else {
/* In case console=hvc0 is passed this will very likely result in EEXIST */
return 0;
else {
- log_error
(
"Failed to create symlink %s: %m", to);
+ log_error
_errno(errno,
"Failed to create symlink %s: %m", to);
return -errno;
}
}
return -errno;
}
}
@@
-67,7
+67,7
@@
static int add_serial_getty(const char *tty) {
log_debug("Automatically adding serial getty for /dev/%s.", tty);
log_debug("Automatically adding serial getty for /dev/%s.", tty);
- n = unit_name_
replace_instance("serial-getty@.service", tty
);
+ n = unit_name_
from_path_instance("serial-getty", tty, ".service"
);
if (!n)
return log_oom();
if (!n)
return log_oom();
@@
-81,7
+81,7
@@
static int add_container_getty(const char *tty) {
log_debug("Automatically adding container getty for /dev/pts/%s.", tty);
log_debug("Automatically adding container getty for /dev/pts/%s.", tty);
- n = unit_name_
replace_instance("container-getty@.service", tty
);
+ n = unit_name_
from_path_instance("container-getty", tty, ".service"
);
if (!n)
return log_oom();
if (!n)
return log_oom();
@@
-97,7
+97,7
@@
static int verify_tty(const char *name) {
* friends. Let's check that and open the device and run
* isatty() on it. */
* friends. Let's check that and open the device and run
* isatty() on it. */
- p = str
append
a("/dev/", name);
+ p = str
join
a("/dev/", name);
/* O_NONBLOCK is essential here, to make sure we don't wait
* for DCD */
/* O_NONBLOCK is essential here, to make sure we don't wait
* for DCD */
@@
-154,14
+154,14
@@
int main(int argc, char *argv[]) {
r = getenv_for_pid(1, "container_ttys", &container_ttys);
if (r > 0) {
r = getenv_for_pid(1, "container_ttys", &container_ttys);
if (r > 0) {
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
size_t l;
- FOREACH_WORD(w, l, container_ttys, state) {
+ FOREACH_WORD(w
ord
, l, container_ttys, state) {
const char *t;
char tty[l + 1];
const char *t;
char tty[l + 1];
- memcpy(tty, w, l);
+ memcpy(tty, w
ord
, l);
tty[l] = 0;
/* First strip off /dev/ if it is specified */
tty[l] = 0;
/* First strip off /dev/ if it is specified */
@@
-184,15
+184,15
@@
int main(int argc, char *argv[]) {
}
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
}
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
/* Automatically add in a serial getty on all active
* kernel consoles */
size_t l;
/* Automatically add in a serial getty on all active
* kernel consoles */
- FOREACH_WORD(w, l, active, state) {
+ FOREACH_WORD(w
ord
, l, active, state) {
_cleanup_free_ char *tty = NULL;
_cleanup_free_ char *tty = NULL;
- tty = strndup(w, l);
+ tty = strndup(w
ord
, l);
if (!tty) {
log_oom();
return EXIT_FAILURE;
if (!tty) {
log_oom();
return EXIT_FAILURE;
@@
-218,7
+218,7
@@
int main(int argc, char *argv[]) {
NULSTR_FOREACH(j, virtualization_consoles) {
char *p;
NULSTR_FOREACH(j, virtualization_consoles) {
char *p;
- p = str
append
a("/sys/class/tty/", j);
+ p = str
join
a("/sys/class/tty/", j);
if (access(p, F_OK) < 0)
continue;
if (access(p, F_OK) < 0)
continue;