[systemd-commits] src/sysv-generator

[Lennart Poettering]

 src/sysv-generator/sysv-generator.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9993ef2e9817b35b1d467707bef12b2a140b62dc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jan 27 23:13:28 2015 +0100

    sysv-generator: use is_symlink() utility call where appropriate

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 1e4d548..984beab 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -147,7 +147,6 @@ static int generate_unit_file(SysvStub *s) {
         _cleanup_free_ char *wants = NULL;
         _cleanup_free_ char *conflicts = NULL;
         int r;
-        struct stat st;
 
         before = strv_join(s->before, " ");
         if (!before)
@@ -172,9 +171,9 @@ static int generate_unit_file(SysvStub *s) {
         /* We might already have a symlink with the same name from a Provides:,
          * or from backup files like /etc/init.d/foo.bak. Real scripts always win,
          * so remove an existing link */
-        if (lstat(unit, &st) == 0 && S_ISLNK(st.st_mode)) {
+        if (is_symlink(unit)) {
                 log_warning("Overwriting existing symlink %s with real service", unit);
-                unlink(unit);
+                (void) unlink(unit);
         }
 
         f = fopen(unit, "wxe");