From 070217f673f344e88c871a69b5fe8d2f75d21fbe Mon Sep 17 00:00:00 2001 From: obarun <eric@obarun.org> Date: Mon, 30 Oct 2023 20:14:49 +1100 Subject: [PATCH] remove write_make_symlink function --- src/include/66/write.h | 2 - src/lib66/write/deps-lib/deps | 1 - src/lib66/write/write_make_symlink.c | 56 ---------------------------- src/lib66/write/write_service.c | 2 - 4 files changed, 61 deletions(-) delete mode 100644 src/lib66/write/write_make_symlink.c diff --git a/src/include/66/write.h b/src/include/66/write.h index d2744447..29b513ce 100644 --- a/src/include/66/write.h +++ b/src/include/66/write.h @@ -28,6 +28,4 @@ extern int write_execute_scripts(char const *file, char const *contents, char co extern int write_uint(char const *dst, char const *name, uint32_t ui) ; extern int write_environ(char const *name, char const *contents, char const *dst) ; -extern void write_make_symlink(resolve_service_t *res) ; - #endif diff --git a/src/lib66/write/deps-lib/deps b/src/lib66/write/deps-lib/deps index 8c3cc1ba..d07d1f64 100644 --- a/src/lib66/write/deps-lib/deps +++ b/src/lib66/write/deps-lib/deps @@ -3,7 +3,6 @@ write_common.o write_environ.o write_execute_scripts.o write_logger.o -write_make_symlink.o write_oneshot.o write_service.o write_uint.o diff --git a/src/lib66/write/write_make_symlink.c b/src/lib66/write/write_make_symlink.c deleted file mode 100644 index 6719982f..00000000 --- a/src/lib66/write/write_make_symlink.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * write_make_symlink.c - * - * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org> - * - * All rights reserved. - * - * This file is part of Obarun. It is subject to the license terms in - * the LICENSE file found in the top-level directory of this - * distribution. - * This file may not be copied, modified, propagated, or distributed - * except according to the terms contained in the LICENSE file./ - */ - -#include <string.h> -#include <sys/stat.h> -#include <sys/errno.h> - -#include <oblibs/log.h> -#include <oblibs/string.h> - -#include <66/service.h> -#include <66/constants.h> - -void write_make_symlink(resolve_service_t *res) -{ - log_flow() ; - - int r ; - struct stat st ; - char *name = res->sa.s + res->name ; - size_t namelen = strlen(name), homelen = strlen(res->sa.s + res->path.home) ; - - char sym[homelen + SS_SYSTEM_LEN + SS_RESOLVE_LEN + SS_SERVICE_LEN + 1 + namelen + 1] ; - char dst[homelen + SS_SYSTEM_LEN + SS_SERVICE_LEN + SS_SVC_LEN + SS_RESOLVE_LEN + 1 + namelen + 1] ; - - auto_strings(sym, res->sa.s + res->path.home, SS_SYSTEM, SS_RESOLVE, SS_SERVICE, "/", name) ; - - auto_strings(dst, res->sa.s + res->path.home, SS_SYSTEM, SS_SERVICE, SS_SVC, "/", name) ; - - r = lstat(sym, &st) ; - if (r < 0) { - - if (errno != ENOENT) { - - log_dieusys(LOG_EXIT_SYS, "lstat: ", sym) ; - - } else { - - log_trace("symlink: ", sym, " to: ", dst) ; - r = symlink(dst, sym) ; - if (r < 0 && errno != EEXIST) - log_dieusys(LOG_EXIT_SYS, "point symlink: ", sym, " to: ", dst) ; - } - } -} \ No newline at end of file diff --git a/src/lib66/write/write_service.c b/src/lib66/write/write_service.c index 4a70cce0..1b16fdbd 100644 --- a/src/lib66/write/write_service.c +++ b/src/lib66/write/write_service.c @@ -33,8 +33,6 @@ /** @Return 0 on fail * @Return 1 on success * @Return 2 if the service is ignored - * - * @workdir -> /var/lib/66/system/<tree>/servicedirs/ * */ void write_services(resolve_service_t *res, char const *workdir, uint8_t force) { -- GitLab