static const char *arg_dest = "/tmp";
static int add_symlink(const char *fservice, const char *tservice) {
- _cleanup_free_ char *from = NULL, *to = NULL;
+ char *from, *to;
int r;
assert(fservice);
assert(tservice);
- from = strappend(SYSTEM_DATA_UNIT_PATH "/", fservice);
- if (!from)
- return log_oom();
-
- to = strjoin(arg_dest,"/getty.target.wants/", tservice, NULL);
- if (!to)
- return log_oom();
+ from = strappenda(SYSTEM_DATA_UNIT_PATH "/", fservice);
+ to = strappenda3(arg_dest, "/getty.target.wants/", tservice);
mkdir_parents_label(to, 0755);
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();
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();
/* Automatically add in a serial getty on the first
* virtualizer console */
NULSTR_FOREACH(j, virtualization_consoles) {
- _cleanup_free_ char *p = NULL;
-
- p = strappend("/sys/class/tty/", j);
- if (!p) {
- log_oom();
- return EXIT_FAILURE;
- }
+ char *p;
+ p = strappenda("/sys/class/tty/", j);
if (access(p, F_OK) < 0)
continue;