util-lib: split our string related calls from util.[ch] into its own file string...

[thirdparty/systemd.git] / src / system-update-generator / system-update-generator.c

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 2e37410bf4c221c6e9a91a25386acfd1b2035ffb..794aa1a0c7fcb6f1a6b04e1e57b2aea295689170 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -23,9 +23,8 @@
 #include <unistd.h>
 
 #include "log.h"
+#include "string-util.h"
 #include "util.h"
-#include "unit-name.h"
-#include "path-util.h"
 
 /*
  * Implements the logic described in
@@ -37,7 +36,7 @@ static const char *arg_dest = "/tmp";
 static int generate_symlink(void) {
         const char *p = NULL;
 
-        if (access("/system-update", F_OK) < 0) {
+        if (laccess("/system-update", F_OK) < 0) {
                 if (errno == ENOENT)
                         return 0;
 
@@ -45,11 +44,9 @@ static int generate_symlink(void) {
                 return -EINVAL;
         }
 
-        p = strappenda(arg_dest, "/default.target");
-        if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
-                log_error_errno(errno, "Failed to create symlink %s: %m", p);
-                return -errno;
-        }
+        p = strjoina(arg_dest, "/default.target");
+        if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", p);
 
         return 0;
 }