From ed1eaa0ddb19d458015f924284d48b36d2fd583b Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Wed, 10 May 2023 22:30:13 +1100
Subject: [PATCH] add set_treeinfo to lib66
---
src/66/66.c | 16 ---------------
src/include/66/ssexec.h | 1 -
src/include/66/utils.h | 1 +
src/lib66/utils/deps-lib/deps | 1 +
src/lib66/utils/set_treeinfo.c | 37 ++++++++++++++++++++++++++++++++++
5 files changed, 39 insertions(+), 17 deletions(-)
create mode 100644 src/lib66/utils/set_treeinfo.c
diff --git a/src/66/66.c b/src/66/66.c
index e099488c..0a63d946 100644
--- a/src/66/66.c
+++ b/src/66/66.c
@@ -27,22 +27,6 @@
#include <66/tree.h>
#include <66/hpr.h>
-void set_treeinfo(ssexec_t *info)
-{
- log_flow() ;
-
- int r = tree_sethome(info) ;
- if (r == -1)
- log_dieu(LOG_EXIT_USER, "set the tree name") ;
- if (!r)
- log_dieu(LOG_EXIT_USER, "parse seed file") ;
-
- if (!tree_get_permissions(info->base.s, info->treename.s))
- log_die(LOG_EXIT_USER,"You're not allowed to use the tree: ",info->treename.s) ;
-
- info->treeallow = 1 ;
-}
-
static void set_info(ssexec_t *info)
{
log_flow() ;
diff --git a/src/include/66/ssexec.h b/src/include/66/ssexec.h
index cc50f550..f3a6c717 100644
--- a/src/include/66/ssexec.h
+++ b/src/include/66/ssexec.h
@@ -88,7 +88,6 @@ typedef ssexec_func_t *ssexec_func_t_ref ;
extern void ssexec_free(ssexec_t *info) ;
extern void ssexec_copy(ssexec_t *dest, ssexec_t *src) ;
extern ssexec_t const ssexec_zero ;
-extern void set_treeinfo(ssexec_t *info) ;
/** main */
extern ssexec_func_t ssexec_parse ;
diff --git a/src/include/66/utils.h b/src/include/66/utils.h
index 48ab09a9..128b2e83 100644
--- a/src/include/66/utils.h
+++ b/src/include/66/utils.h
@@ -59,5 +59,6 @@ extern void name_isvalid(char const *name) ;
extern int set_ownerhome_stack(char *store) ;
extern int set_ownersysdir_stack(char *base, uid_t owner) ;
+extern void set_treeinfo(ssexec_t *info) ;
#endif
diff --git a/src/lib66/utils/deps-lib/deps b/src/lib66/utils/deps-lib/deps
index 014c51bb..b0b411ed 100644
--- a/src/lib66/utils/deps-lib/deps
+++ b/src/lib66/utils/deps-lib/deps
@@ -6,6 +6,7 @@ set_livescan.o
set_livestate.o
set_ownerhome.o
set_ownersysdir.o
+set_treeinfo.o
visit.o
yourgid.o
youruid.o
diff --git a/src/lib66/utils/set_treeinfo.c b/src/lib66/utils/set_treeinfo.c
new file mode 100644
index 00000000..3495a5e4
--- /dev/null
+++ b/src/lib66/utils/set_treeinfo.c
@@ -0,0 +1,37 @@
+/*
+ * set_treeinfo.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 <stddef.h>
+
+#include <oblibs/log.h>
+
+#include <66/utils.h>
+#include <66/ssexec.h>
+#include <66/tree.h>
+
+void set_treeinfo(ssexec_t *info)
+{
+ log_flow() ;
+
+ int r = tree_sethome(info) ;
+ if (r == -1)
+ log_dieu(LOG_EXIT_USER, "set the tree name") ;
+ if (!r)
+ log_dieu(LOG_EXIT_USER, "parse seed file") ;
+
+ if (!tree_get_permissions(info->base.s, info->treename.s))
+ log_die(LOG_EXIT_USER,"You're not allowed to use the tree: ",info->treename.s) ;
+
+ info->treeallow = 1 ;
+}
--
GitLab