log.h: new log_oom() -> int -ENOMEM, use it

[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 58ad8a66358e4b8a5d2cefc2d2e3d9321c8d19be..1cef6aeae999851db56328badeae72fd00dc5a26 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -38,16 +38,15 @@ static int add_symlink(const char *fservice, const char *tservice) {
         assert(fservice);
         assert(tservice);
 
-        asprintf(&from, SYSTEM_DATA_UNIT_PATH "/%s", fservice);
-        asprintf(&to, "%s/getty.target.wants/%s", arg_dest, tservice);
+        from = strappend(SYSTEM_DATA_UNIT_PATH "/", fservice);
+        to = strjoin(arg_dest,"/getty.target.wants/", tservice, NULL);
 
         if (!from || !to) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
-        mkdir_parents(to, 0755);
+        mkdir_parents_label(to, 0755);
 
         r = symlink(from, to);
         if (r < 0) {
@@ -77,10 +76,8 @@ static int add_serial_getty(const char *tty) {
         log_debug("Automatically adding serial getty for /dev/%s.", tty);
 
         n = unit_name_replace_instance("serial-getty@.service", tty);
-        if (!n) {
-                log_error("Out of memory");
-                return -ENOMEM;
-        }
+        if (!n)
+                return log_oom();
 
         r = add_symlink("serial-getty@.service", n);
         free(n);
@@ -99,24 +96,24 @@ int main(int argc, char *argv[]) {
         char *active;
         const char *j;
 
-        if (argc > 2) {
-                log_error("This program takes one or no arguments.");
+        if (argc > 1 && argc != 4) {
+                log_error("This program takes three or no arguments.");
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        if (argc > 1)
+                arg_dest = argv[1];
+
+        log_set_target(LOG_TARGET_SAFE);
         log_parse_environment();
         log_open();
 
         umask(0022);
 
-        if (argc > 1)
-            arg_dest = argv[1];
-
         if (detect_container(NULL) > 0) {
                 log_debug("Automatically adding console shell.");
 
-                if (add_symlink("console-shell.service", "console-shell.service") < 0)
+                if (add_symlink("console-getty.service", "console-getty.service") < 0)
                         r = EXIT_FAILURE;
 
                 /* Don't add any further magic if we are in a container */
@@ -160,7 +157,7 @@ int main(int argc, char *argv[]) {
                 int k;
 
                 if (asprintf(&p, "/sys/class/tty/%s", j) < 0) {
-                        log_error("Out of memory");
+                        log_oom();
                         r = EXIT_FAILURE;
                         goto finish;
                 }