diff --git a/Makefile b/Makefile
index 2bc802109ff7a7b3b63568abc316e82f69eb115b..8408e8d211900ed03f4397790d41ea3b930a2237 100644
--- a/Makefile
+++ b/Makefile
@@ -125,14 +125,15 @@ $(DESTDIR)$(datarootdir)/doc/$(package)/%.html: doc/html/%.html
-e 's,%%system_dir%%,$(system_dir),g' \
-e 's,%%system_log%%,$(system_log),g' \
-e 's,%%service_system%%,$(service_system),g' \
+ -e 's,%%service_module%%,$(module_system),g' \
-e 's,%%service_adm%%,$(service_adm),g' \
-e 's,%%service_admconf%%,$(service_admconf),g' \
-e 's,%%user_dir%%,$(user_dir),g' \
-e 's,%%service_user%%,$(service_user),g' \
-e 's,%%service_userconf%%,$(service_userconf),g' \
- -e 's,%%skel%%,$(skel),g' \
- -e 's,%%s6log_user%%,$(s6log_user),g' \
- -e 's,%%user_log%%,$(user_log),g' $< > $@
+ -e 's,%%user_log%%,$(user_log),g' \
+ -e 's,%%s6log_user%%,$(s6log_user),g' \
+ -e 's,%%skel%%,$(skel),g' $< > $@
$(DESTDIR)$(sysconfdir)/66/%: skel/%
@@ -193,17 +194,19 @@ man: $(ALL_MAN:%.scd=%)
%: %.scd
sed -e 's,%%livedir%%,$(livedir),' \
- -e 's,%%system_dir%%,$(system_dir),' \
- -e 's,%%user_dir%%,$(user_dir),' \
- -e 's,%%service_sysconf%%,$(service_admconf),' \
- -e 's,%%service_userconf%%,$(service_userconf),' \
- -e 's,%%service_packager%%,$(service_system),g' \
- -e 's,%%user_log%%,$(user_log),' \
- -e 's,%%service_sys%%,$(service_adm),' \
- -e 's,%%system_log%%,$(system_log),' \
- -e 's,%%sysconfdir%%,$(skel),' \
+ -e 's,%%sysconfdir%%,$(skel),' \
+ -e 's,%%system_dir%%,$(system_dir),' \
+ -e 's,%%system_log%%,$(system_log),' \
+ -e 's,%%service_system%%,$(service_system),g' \
+ -e 's,%%module_system%%,$(module_system),g' \
+ -e 's,%%service_adm%%,$(service_adm),' \
+ -e 's,%%service_admconf%%,$(service_admconf),' \
+ -e 's,%%user_dir%%,$(user_dir),' \
+ -e 's,%%service_user%%,$(service_user),' \
+ -e 's,%%service_userconf%%,$(service_userconf),' \
+ -e 's,%%user_log%%,$(user_log),' \
-e 's,%%s6log_user%%,$(s6log_user),' \
- -e 's,%%service_user%%,$(service_user),' $@.scd | scdoc > $@
+ -e 's,%%skel%%,$(skel),g' $@.scd | scdoc > $@
install-man:
for i in 1 5 8 ; do \
diff --git a/NEWS b/NEWS
index 0984c6e15ecd15a986501892a2e88f5d60036e9d..7996b253b2394a44fff43b7e0ac423038a7f8aed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
Changelog for 66
+In 0.2.5.2
+----------
+
+ - Fix build: Remove bytes.h oblibs header file
+
+In 0.2.5.1
+----------
+
+ - Bugs fix
+ - 66-tree -S options: if after_tree and tree have the same name,
+ tree is considered as the very first tree to start.
+ - 66-unmountall: do not umount SS_LIVE
+ - Add SIGPWR control file at creation of .s6-svscan directory
In 0.2.5.0
----------
diff --git a/build_toolchain.sh b/build_toolchain.sh
index 0fdc7eb65019d6373a6ad1b463bc40e66344258b..25899ddd92498f2796795b2c932f0054fe796bd1 100755
--- a/build_toolchain.sh
+++ b/build_toolchain.sh
@@ -4,7 +4,7 @@ skalibs_tag="v2.9.1.0"
execline_tag="v2.5.3.0"
s6_tag="v2.9.0.1"
s6_rc_tag="v0.5.1.1"
-oblibs_tag="v0.0.5.0"
+oblibs_tag="v0.0.5.1"
## skalibs
build_skalibs() {
diff --git a/configure b/configure
index e5b0e4662b4999ba9d0ef113b72e8eaa208b2539..db3f34ae57d6a2a5f03b1b98cc3518b7036e41e9 100755
--- a/configure
+++ b/configure
@@ -35,23 +35,29 @@ Fine tuning of the installation directories:
--with-system-dir=DIR 66 tools system working directory [/var/lib/66]
--with-system-service=DIR system service frontend directory [DATAROOTDIR/66/service]
+ --with-system-module=DIR system module directory [DATAROOTDIR/66/module]
--with-sysadmin-service=DIR sysadmin service frontend directory [SYSDIR/66/service]
--with-sysadmin-service-conf=DIR sysadmin service configuration file directory [SYSDIR/66/conf]
+ --with-sysadmin-module=DIR sysadmin module directory [SYSDIR/66/module]
+
--with-user-dir=DIR 66 tools user working directory [.66]
--with-user-log=DIR user service log directory [.66/log]
--with-user-service=DIR user service directory [.66/service]
--with-user-service-conf=DIR user service configuration directory [.66/conf]
+ --with-user-module=DIR user module directory [.66/module]
+
Do not set an absolute path but a \$HOME relative path for --with-user-dir,
- --with-user-log, --with-user-service, --with-user-service-conf. The \$HOME prefix
- will be appened at the pathname automatically in function of the user.
+ --with-user-log, --with-user-service, --with-user-service-conf and --with-user-module.
+ The \$HOME prefix will be appened at the pathname automatically in function of the user.
For example , by default the final path for --with-user-dir will be \$HOME/.66.
--with-system-service and --with-sysadmin-service directory must be two differents path.
For example do not set --with-sysadmin-service=/etc/66/service/sysadmin with system service
--with-system-service=/etc/66/service.
+ Apply the same rule for --with-system-module and --with-sysadmin-module options.
Dependencies:
--with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps]
@@ -176,10 +182,13 @@ system_dir='/var/lib/66'
system_log='/var/log/66'
s6log_user='root'
service_system='$datarootdir/66/service'
+module_system='$datarootdir/66/module'
service_adm='$sysconfdir/66/service'
+module_adm='$sysconfdir/66/module'
service_admconf='$sysconfdir/66/conf'
user_dir='.66'
service_user='.66/service'
+module_user='.66/module'
service_userconf='.66/conf'
user_log='.66/log'
sysdeps='$prefix/lib/skalibs/sysdeps'
@@ -222,10 +231,13 @@ for arg ; do
--with-system-log=*) system_log=${arg#*=} ;;
--with-s6-log-user=*) s6log_user=${arg#*=} ;;
--with-system-service=*) service_system=${arg#*=} ;;
+ --with-system-module=*) module_system=${arg#*=} ;;
--with-sysadmin-service=*) service_adm=${arg#*=} ;;
+ --with-sysadmin-module=*) module_adm=${arg#*=} ;;
--with-sysadmin-service-conf=*) service_admconf=${arg#*=} ;;
--with-user-dir=*) user_dir=${arg#*=} ;;
--with-user-service=*) service_user=${arg#*=} ;;
+ --with-user-module=*) module_user=${arg#*=} ;;
--with-user-service-conf=*) service_userconf=${arg#*=} ;;
--with-user-log=*) user_log=${arg#*=} ;;
--with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;;
@@ -277,6 +289,9 @@ if test -z "$sysconfdir" ; then
if test "$service_adm" = '$sysconfdir/66/service' ; then
service_adm = '$sysconfdir/66/service'
fi
+ if test "$module_adm" = '$sysconfdir/66/module' ; then
+ service_adm = '$sysconfdir/66/module'
+ fi
if test "$service_admconf" = '$sysconfdir/66/conf' ; then
service_admconf = '$sysconfdir/66/conf'
fi
@@ -289,21 +304,21 @@ fi
stripdir prefix
for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir \
datarootdir mandir shebangdir livedir skel system_dir system_log \
- service_system service_adm service_admconf sproot sysdeps ; do
+ service_system module_system service_adm module_adm service_admconf sproot sysdeps ; do
eval tmp=\${$i}
eval $i=$tmp
stripdir $i
done
stripdir datarootdir
-for i in service_system mandir; do
+for i in service_system module_system mandir; do
eval tmp=\${$i}
eval $i=$tmp
stripdir $i
done
stripdir sysconfdir
-for i in service_adm service_admconf skel; do
+for i in service_adm module_adm service_admconf skel; do
eval tmp=\${$i}
eval $i=$tmp
stripdir $i
@@ -345,7 +360,9 @@ if $slashpackage ; then
system_dir=${home}/${system_dir}
system_log=${datarootdir}/${system_log}
service_system=${home}/${service_system}
+ module_system=${home}/${module_system}
service_adm=${home}/${sysconfdir}/${service_adm}
+ module_adm=${home}/${sysconfdir}/${module_adm}
service_admconf=${home}/${sysconfdir}/${service_admconf}
if $shebangisdefault ; then
shebangdir=${extbinprefix}
@@ -506,10 +523,13 @@ system_dir := $system_dir
system_log := $system_log
s6log_user := $s6log_user
service_system := $service_system
+module_system := $module_system
service_adm := $service_adm
+module_adm := $module_adm
service_admconf := $service_admconf
user_dir := $user_dir
service_user := $service_user
+module_user := $module_user
service_userconf := $service_userconf
user_log := $user_log
sysdeps := $sysdeps
@@ -567,7 +587,7 @@ echo "Creating src/include/${package}/config.h..."
mkdir -p -m 0755 src/include/${package}
exec 3>&1 1> src/include/${package}/config.h
cat <<EOF
-/* Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
+/* Copyright (c) 2018-2020 Eric Vidal <eric@obarun.org>
All rights reserved.*/
/* ISC license. */
@@ -586,6 +606,8 @@ All rights reserved.*/
#define ${package_macro_name}_SERVICE_SYSDIR "$service_system/"
#define ${package_macro_name}_SERVICE_ADMDIR "$service_adm/"
#define ${package_macro_name}_SERVICE_ADMCONFDIR "$service_admconf/"
+#define ${package_macro_name}_MODULE_SYSDIR "$module_system/"
+#define ${package_macro_name}_MODULE_ADMDIR "$module_adm/"
/** Do not use absolute path but a \$HOME relative path
* The /home/name_of_user prefix will be automatically added to the pathname */
@@ -593,6 +615,7 @@ All rights reserved.*/
#define ${package_macro_name}_LOGGER_USERDIR "$user_log/"
#define ${package_macro_name}_SERVICE_USERDIR "$service_user/"
#define ${package_macro_name}_SERVICE_USERCONFDIR "$service_userconf/"
+#define ${package_macro_name}_MODULE_USERDIR "$module_user/"
EOF
if $slashpackage ; then
diff --git a/doc/html/66-all.html b/doc/html/66-all.html
index 0fa2fff225e8bd81827e4d7e9075d6c058bee3b6..d136b275940866ac66e4c6090d78b00d6325a371 100644
--- a/doc/html/66-all.html
+++ b/doc/html/66-all.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-all [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -T <em>timeout</em> ] [ -f ] [ -t <em>tree</em> ] <em>up/down</em>
+ 66-all [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -T <em>timeout</em> ] [ -f ] [ -t <em>tree</em> ] <em>up/down</em>
</pre>
<p>
@@ -37,7 +37,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-dbctl.html b/doc/html/66-dbctl.html
index 52e1c4a80c052249f942df3d19dc2e2543a3b794..13020d29f5bb8071ecfcb6e218f510060eb50aac 100644
--- a/doc/html/66-dbctl.html
+++ b/doc/html/66-dbctl.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-dbctl [ -h help ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -u | d | r ] <em>service(s)</em>
+ 66-dbctl [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -u | d | r ] <em>service(s)</em>
</pre>
<p>
@@ -37,7 +37,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-disable.html b/doc/html/66-disable.html
index 6911fc7e954b7d17944147dc056480b5c4f7902a..026c45f66734d7f5150c45c4a26318010c3bcedc 100644
--- a/doc/html/66-disable.html
+++ b/doc/html/66-disable.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-disable [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -S ] <em>service(s)</em>
+ 66-disable [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -S ] <em>service(s)</em>
</pre>
<p>
@@ -36,7 +36,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-enable.html b/doc/html/66-enable.html
index 798394b880f866ddd7001ec5d7e43c6ff728b827..c61f5036b741c0ec286283547ed13121dcfa743c 100644
--- a/doc/html/66-enable.html
+++ b/doc/html/66-enable.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-enable [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -f|F ] [ -c|C ] [ -S ] <em>service(s)</em>
+ 66-enable [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -f|F ] [ -c|C ] [ -S ] <em>service(s)</em>
</pre>
<p>
@@ -39,7 +39,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-env.html b/doc/html/66-env.html
index 6333b68b65d378ca3c2c1f2daf71019c8643e641..7b39148c94b80ab8c8371ff5028b2d806e1c1839 100644
--- a/doc/html/66-env.html
+++ b/doc/html/66-env.html
@@ -25,7 +25,7 @@
<h2>Interface</h2>
<pre>
- 66-env [ -h ] [ -v <em>verbosity</em> ] [ -t <em>tree</em> ] [ -d <em>dir</em> ] [ -L ] [ -e ] [ -r <em>key=value</em> ] <em>service</em>
+ 66-env [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -t <em>tree</em> ] [ -d <em>dir</em> ] [ -L ] [ -e ] [ -r <em>key=value</em> ] <em>service</em>
</pre>
<ul>
@@ -56,9 +56,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-init.html b/doc/html/66-init.html
index 1493576307bae2191987f4be77c9c02bab8ea73e..3ab7cb03605abfc3f56d6c9f70ae81eebbbc5607 100644
--- a/doc/html/66-init.html
+++ b/doc/html/66-init.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-init [ -h help ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t tree ] <em>classic|database|both</em>
+ 66-init [ -h help ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t tree ] <em>classic|database|both</em>
</pre>
<p>
@@ -36,6 +36,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
+ <li> <tt>-z </tt> : use color. </li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
diff --git a/doc/html/66-inservice.html b/doc/html/66-inservice.html
index ae47e715fc92d860b1a6750546f2929d57f89eb9..7802909d064857defa3bb31728d57b502ccdfd14 100644
--- a/doc/html/66-inservice.html
+++ b/doc/html/66-inservice.html
@@ -23,7 +23,7 @@
<h2>Interface </h2>
<pre>
- 66-inservice [ -h ] [ -v verbosity ] [ -c ] [ -n ] [ -o name,intree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] <em>service</em>
+ 66-inservice [ -h ] [ -z ] [ -v verbosity ] [ -n ] [ -o name,intree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] <em>service</em>
</pre>
<h2>Options </h2>
@@ -32,7 +32,10 @@
<li>
<tt>-h </tt> : prints this help.
</li>
- <li>
+ <li>
+ <tt>-z </tt> : use color.
+ </li>
+ <li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
<tt>1(Default)</tt>: Only print error messages.
@@ -40,9 +43,6 @@
<tt>3</tt>: Also prints tracing messages.
<tt>4</tt>: Also prints debugging messages.
</li>
- <li>
- <tt>-c </tt> : enable colorization.
- </li>
<li>
<tt>-n </tt> : do not display the field name(s) specified.
</li>
diff --git a/doc/html/66-intree.html b/doc/html/66-intree.html
index ec272c08ba2a9c9850e8151ebf85a53705f3674c..21c02c330cf9892f46c02d15d19602b271e1df09 100644
--- a/doc/html/66-intree.html
+++ b/doc/html/66-intree.html
@@ -24,15 +24,14 @@
<h2>Interface </h2>
<pre>
- 66-intree [ -h ] [ -v verbosity ] [ -l live ] [ -c ] [ -n ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] <em>tree</em>
+ 66-intree [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -n ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] <em>tree</em>
</pre>
<h2>Options </h2>
<ul>
- <li>
- <tt>-h </tt> : prints this help.
- </li>
+ <li> <tt>-h </tt> : prints this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
@@ -47,9 +46,6 @@
option to <tt>./configure</tt>. An existing absolute path is expected and
should be within a writable filesystem - likely a RAM filesystem—see <tt><a href="66-scandir.html">66-scandir</a></tt>.
</li>
- <li>
- <tt>-c </tt> : enable colorization.
- </li>
<li>
<tt>-n </tt> : do not display the field name(s) specified.
</li>
diff --git a/doc/html/66-parser.html b/doc/html/66-parser.html
index 2d26b4d615ec1f49b3675483498e6957b55fd5aa..98d4e04613e28d5810f66df34441e1cfbd1b77f7 100644
--- a/doc/html/66-parser.html
+++ b/doc/html/66-parser.html
@@ -24,7 +24,7 @@
<h2>Interface</h2>
<pre>
- 66-parser [ -h ] [ -v <em>verbosity</em> ] [ -f ] [ -c|C ] service destination</em>
+ 66-parser [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -f ] [ -c|C ] service destination</em>
</pre>
<ul>
@@ -45,9 +45,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-scanctl.html b/doc/html/66-scanctl.html
index 83688f69374efefb34d4af14d81e19d622e61c4d..ee5a7ac175887433ae60f329bff30bad40837980 100644
--- a/doc/html/66-scanctl.html
+++ b/doc/html/66-scanctl.html
@@ -24,7 +24,7 @@
<h2>Interface</h2>
<pre>
- 66-scanctl [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -o <em>owner</em> ] signal
+ 66-scanctl [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -o <em>owner</em> ] signal
</pre>
<p>
@@ -34,10 +34,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
-
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-scandir.html b/doc/html/66-scandir.html
index c2bf1e6c2c80825ac51046be00637b2f4ca26b3d..c091fb3afde37d05ec2e3577ffcbf536a5ca2bc9 100644
--- a/doc/html/66-scandir.html
+++ b/doc/html/66-scandir.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-scandir [ -h help ] [ -v <em>verbosity</em> ] [ -b ] [ -l <em>live</em> ] [ -d notif ][ -t <em>rescan</em> ] [ -L <em>log_user</em> ] [ -s <em>skel</em> ] [ -e <em>environment</em> ] [ -c | r | u ] owner
+ 66-scandir [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -b ] [ -l <em>live</em> ] [ -d notif ][ -t <em>rescan</em> ] [ -L <em>log_user</em> ] [ -s <em>skel</em> ] [ -e <em>environment</em> ] [ -c | r | u ] owner
</pre>
<p>
@@ -33,10 +33,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
-
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-start.html b/doc/html/66-start.html
index b9e444875f531f0240fbb1c0f46890ff2b465306..f4ea5a7d0d1aa41a983ec2663ff2571ac0c501e3 100644
--- a/doc/html/66-start.html
+++ b/doc/html/66-start.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-start [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -r | R ] <em>service(s)</em>
+ 66-start [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -r | R ] <em>service(s)</em>
</pre>
<p>
@@ -36,7 +36,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-stop.html b/doc/html/66-stop.html
index f3dc9b3eb925d2af6be464711452ee1f72223b63..7da277c863e04beae78beb7bf428499566383e63 100644
--- a/doc/html/66-stop.html
+++ b/doc/html/66-stop.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-stop [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -u ] [ -X ] [ -K ] <em>service(s)</em>
+ 66-stop [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -u ] [ -X ] [ -K ] <em>service(s)</em>
</pre>
<p>
@@ -36,7 +36,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-svctl.html b/doc/html/66-svctl.html
index c40bdb83fc150d70ce04733d014c95c45abb3abf..4b968c41d1ab5a885b669f84dafcda4137be52f2 100644
--- a/doc/html/66-svctl.html
+++ b/doc/html/66-svctl.html
@@ -24,7 +24,7 @@
<h2>Interface</h2>
<pre>
- 66-svctl [ -h ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -n <em>death</em> ] [ -u | d | r | K | X ] <em>service(s)</em>
+ 66-svctl [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -t <em>tree</em> ] [ -T <em>timeout</em> ] [ -n <em>death</em> ] [ -u | d | r | K | X ] <em>service(s)</em>
</pre>
<p>
@@ -56,10 +56,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
-
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
diff --git a/doc/html/66-tree.html b/doc/html/66-tree.html
index d027795a96632d32a1c8371d0b07f9f39c3c5e45..ac953ec2907810b40ae4ff00b849dbede4c803c9 100644
--- a/doc/html/66-tree.html
+++ b/doc/html/66-tree.html
@@ -23,7 +23,7 @@
<h2> Interface </h2>
<pre>
- 66-tree [ -h ] [ -v <em>verbosity</em> ] [ -l ] [ -n|R ] [ -a|d ] [ -c ] [ -S <em>after_tree</em> ] [ -E|D ] [ -U ] [ -C <em>clone</em> ] <em>tree</em>
+ 66-tree [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l ] [ -n|R ] [ -a|d ] [ -c ] [ -S <em>after_tree</em> ] [ -E|D ] [ -U ] [ -C <em>clone</em> ] <em>tree</em>
</pre>
<p>
@@ -38,7 +38,7 @@
<ul>
<li> <tt>-h </tt> : prints this help. </li>
-
+ <li> <tt>-z </tt> : use color.</li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
@@ -82,8 +82,8 @@
<tt>-S <em>after_tree</em></tt> : Start the <em>tree</em> after <em>after_tree</em>.
This tells <a href="66-all.html">66-all</a> the specific order in which the start process is applied.
<em>after_tree</em> and <em>tree</em> must be already enabled. You can combine this options directly
- with the <tt>-E</tt> option at tree creation time. <b>Note</b>: If <em>after_tree</em> and <em>tree</em>
- have the same name, <em>tree</em> is considered at the very first tree to start.
+ with the <tt>-E</tt> option at tree creation time.
+ <b>Note</b>: If <em>after_tree</em> and <em>tree</em> have the same name, this <em>tree</em> will be the very first tree to start.
</li>
<li>
diff --git a/doc/html/66-update.html b/doc/html/66-update.html
index 8c02e67158f807d4b5180aa6e8c3450b22d18ce6..b5574e0e8404f3a044710262f084ba45f20723f4 100644
--- a/doc/html/66-update.html
+++ b/doc/html/66-update.html
@@ -32,7 +32,7 @@
<h2>Interface</h2>
<pre>
- 66-udpate [ -h ] [ -v <em>verbosity</em> ] [ -c ] [ -l <em>live</em> ] [ -d ] <em>tree</em>
+ 66-udpate [ -h ] [ -z ] [ -v <em>verbosity</em> ] [ -l <em>live</em> ] [ -d ] <em>tree</em>
</pre>
<p>
If no tree is given, all trees of the owner (root or user) of the process will be processed.
@@ -42,10 +42,8 @@
<h2>Options</h2>
<ul>
- <li>
- <tt><b>-h</b></tt> : print this help.
- </li>
-
+ <li> <tt>-h </tt> : print this help.</li>
+ <li> <tt>-z </tt> : use color. </li>
<li>
<tt>-v <em>verbosity</em> </tt>: increases/decreases
the verbosity of the command.
@@ -66,9 +64,6 @@
</li>
<li>
- <tt>-c </tt> : enable colorization.
- </li>
- <li>
<tt>-d </tt> : dry run. Performs operation without
modify the current state of the system. All command's output will
be prefixed by "dry run do: " sentence. It's a good idea to
diff --git a/doc/html/frontend.html b/doc/html/frontend.html
index c2ce38d11fa7c03cf9f4fbbc10fef8fc1bade149..c9ddf9f950dc159183b73810eeed667dfbba2edb 100644
--- a/doc/html/frontend.html
+++ b/doc/html/frontend.html
@@ -16,7 +16,7 @@
<h1>The frontend service file</h1>
<p>
- The <a href="https://skarnet.org/software/s6">s6</a> and <a href="https://skarnet.org/software/s6">s6-rc</a> programs each handle and use several kinds of services and different files. It is quite complex to understand and manage the relationship between all those files and services. If you're interested in the details you should read <a href="https://skarnet.org/software/s6/servicedir.html">the documentation for the s6 servicedir</a> and also about <a href="https://skarnet.org/software/s6/servicedir.html"><em>classic</em></a>, <a href="https://skarnet.org/software/s6-rc/s6-rc-compile.html"> <em>oneshot</em>, <em>longrun</em> (also called <em>atomic</em> services) and <em>bundle</em> services</a> on Obarun. The frontend service file of 66 tools allows you to deal with all these different services in a centralized manner in one single place.
+ The <a href="https://skarnet.org/software/s6">s6</a> and <a href="https://skarnet.org/software/s6">s6-rc</a> programs each handle and use several kinds of services and different files. It is quite complex to understand and manage the relationship between all those files and services. If you're interested in the details you should read <a href="https://skarnet.org/software/s6/servicedir.html">the documentation for the s6 servicedir</a> and also about <a href="https://skarnet.org/software/s6/servicedir.html"><em>classic</em></a>, <a href="https://skarnet.org/software/s6-rc/s6-rc-compile.html"> <em>oneshot</em>, <em>longrun</em> (also called <em>atomic</em> services), <em>bundle</em></a> and <a href="#module"><em>module</em></a> services on Obarun. The frontend service file of 66 tools allows you to deal with all these different services in a centralized manner in one single place.
<br>
By default 66 tools expects to find any service files in <tt>%%service_system%%</tt> although this can be changed at compile time by passing the <tt>--with-service-path=<em>DIR</em></tt> option to <tt>./configure.</tt>
</p>
@@ -89,6 +89,9 @@
<li>
<a href="#environment">[environment]</a>
</li>
+ <li>
+ <a href="#regex">[regex]</a>
+ </li>
</ul>
<p>
@@ -204,6 +207,25 @@ long/path</pre>
<ul>
<pre>MYKEY=
MYVALUE</pre>
+ </ul>
+ <br><hr><br>
+
+ <li>
+ <tt><b>colon</b></tt> : A value between double colons followed by a <tt>pair</tt> syntax.
+ Must be one by line.
+ </li>
+ <p>Valid syntax:</p>
+ <ul>
+ <pre>::key=value</pre>
+ <pre>:filename:key=value</pre>
+ </ul>
+ <p>(!) Invalid syntax:</p>
+ <ul>
+ <pre>::MYKEY=
+MYVALUE</pre>
+ <pre>::
+MYKEY=MYVALUE</pre>
+ <pre>::key=value :filename:anotherkey=anothervalue</pre>
</ul>
</ul>
<br>
@@ -231,8 +253,8 @@ MYVALUE</pre>
<p><em><tt><strong>Note:</strong></tt></em> If you don't care about dependencies between services or if you don't need
specific tasks to get done before running the daemon, "classic" is the best pick.</p><br>
- <br><hr style="border: 1px dashed #000000">
-
+ <br><hr style="border: 1px dashed #000000">
+
<li><h4>@name</h4></li>
<h5>Corresponds to the <em>name of the service directory</em> of s6 and s6-rc programs.</h5>
<p>Name of the service.</p>
@@ -253,6 +275,18 @@ MYVALUE</pre>
</li>
</ul>
+ <br><hr style="border: 1px dashed #000000">
+
+ <li><h4>@version</h4></li>
+ <h5>Without equivalent, this key is unique to 66 tools.</h5>
+ <p>Version number of the service.</p>
+ <p><tt>mandatory</tt> : yes (!)</p>
+ <p><tt>syntax</tt> : inline</p>
+ <p><tt>valid values</tt> :</p>
+ <ul>
+ <li>Any valid number</li>
+ </ul>
+
<br><hr style="border: 1px dashed #000000">
<li><h4>@description</h4></li>
@@ -294,7 +328,7 @@ MYVALUE</pre>
<p><tt>valid values</tt> :</p>
<ul>
<li>The <em>name</em> of any valid service with type
- <tt>bundle</tt>, <tt>longrun</tt> or <tt>oneshot</tt>. Services of type <tt>classic</tt>
+ <tt>bundle</tt>, <tt>longrun</tt>, <tt>oneshot</tt> or <tt>module</tt>. Services of type <tt>classic</tt>
are not allowed.
<br>The <em>order is of importance</em> (!). If fooA depends on fooB and fooB
depends on fooC the order needs to be:
@@ -313,6 +347,11 @@ MYVALUE</pre>
</li>
</ul>
+ <p>A service can be commented out by placing the number sign '#' at the
+ begin of the name like this:</p>
+ <pre>@depends = ( fooA #fooB fooC)</pre>
+
+ <br><hr style="border: 1px dashed #000000">
<li><h4>@optsdepends</h4></li>
<h5>Without equivalent, this key is unique to 66 tools.</h5>
@@ -323,7 +362,7 @@ MYVALUE</pre>
<p><tt>valid values</tt> :</p>
<ul>
<li>The <em>name</em> of any valid service with type
- <tt>bundle</tt>, <tt>longrun</tt> or <tt>oneshot</tt>. Services of type <tt>classic</tt>
+ <tt>bundle</tt>, <tt>longrun</tt>, <tt>oneshot</tt> or <tt>module</tt>. Services of type <tt>classic</tt>
are not allowed.
A service declared as optional dependencies is not mandatory.
The parser will look at all trees if the corresponding service is
@@ -351,6 +390,11 @@ MYVALUE</pre>
treeB then treeA. <tt><a href="66-intree.html">66-intree</a></tt> can give you
the start order with the field <tt>Start after</tt>.
</p>
+ <p>A service can be commented out by placing the number sign '#' at the
+ begin of the name like this:</p>
+ <pre>@optsdepends = ( fooA #fooB fooC)</pre>
+
+<br><hr style="border: 1px dashed #000000">
<li><h4>@extdepends</h4></li>
<h5>Without equivalent, this key is unique to 66 tools.</h5>
@@ -361,7 +405,7 @@ MYVALUE</pre>
<p><tt>valid values</tt> :</p>
<ul>
<li>The <em>name</em> of any valid service with type
- <tt>bundle</tt>, <tt>longrun</tt> or <tt>oneshot</tt>. Services of type <tt>classic</tt>
+ <tt>bundle</tt>, <tt>longrun</tt>, <tt>oneshot</tt> or <tt>module</tt>. Services of type <tt>classic</tt>
are not allowed.
A service declared as an external dependencies is mandatory.
The parser will search through all trees whether the corresponding service is
@@ -389,22 +433,28 @@ MYVALUE</pre>
declared on treeB, it's the responsibility of the sysadmin to start first
treeB then treeA. <tt><a href="66-intree.html">66-intree</a></tt> will give you
the start order with the field <tt>Start after</tt>.</p>
-
+
+ <p>A service can be commented out by placing the number sign '#' at the
+ begin of the name like this:</p>
+ <pre>@extdepends = ( fooA #fooB fooC)</pre>
+
<br><hr style="border: 1px dashed #000000">
<li><h4>@contents</h4></li>
<h5>Corresponds to the file "<em>contents</em>" of s6-rc programs.</h5>
<p>Declare the contents of a bundle service.</p>
<p><tt>mandatory</tt> : yes (!)—for services of type <tt>bundle</tt>.
- <em>Optional</em> for services of type <tt>oneshot</tt> or <tt>longrun</tt>.
- No effect at all for services of type <tt>classic</tt>.</p>
+ Not allowed for all other services type.</p>
<p><tt>syntax</tt> : bracket</p>
<p><tt>valid values</tt> :</p>
<ul>
- <li>The name of any valid service of type <tt>bundle</tt>, <tt>longrun</tt> or <tt>oneshot</tt>. Services of type <tt>classic</tt>
+ <li>The name of any valid service of type <tt>bundle</tt>, <tt>longrun</tt>, <tt>oneshot</tt> or <tt>module</tt>. Services of type <tt>classic</tt>
are not allowed.
</li>
- </ul>
+ </ul>
+ <p>A service can be commented out by placing the number sign '#' at the
+ begin of the name like this:</p>
+ <pre>@contents = ( fooA #fooB fooC)</pre>
<br><hr style="border: 1px dashed #000000">
@@ -731,8 +781,8 @@ same behaviour. -->
<li>Any valid path on the system.</li>
<p>The directory where to save the log file. This directory is automatically created.
The current user of the process needs to have sufficient permissions on the destination directory
- to be able to create it. The default directory is <tt>/var/log/66/servicename</tt> for <tt>root</tt> and
- <tt>$HOME/.66/log/servicename</tt> for any regular user. The default can also be changed at compile-time by
+ to be able to create it. The default directory is <tt>%%system_log%%/servicename</tt> for <tt>root</tt> and
+ <tt>$HOME/%%user_log%%/servicename</tt> for any regular user. The default can also be changed at compile-time by
passing the <tt>--with-system-logpath=<em>DIR</em></tt> option
for root and <tt>--with-user-logpath=<em>DIR</em></tt> for a user to <tt>./configure.</tt></p>
</ul>
@@ -837,6 +887,89 @@ created by default at %%service_admconf%%/name_of_service directory. The default
</ul>
</ul>
<br><hr>
+
+<h2 id="regex">Section: [regex]</h2>
+
+<p>This section is <em>optional</em>.</p>
+<p>It will only have an effect when the service is a <tt><a href="#module">module</a></tt> type.</p>
+<p>You can use the '@I' string as key field. It will replaced by the
+<tt><a href="#module">module</a></tt> name as you do for instantiated service before applying the
+regex section.</p>
+<h3>Valid <em>key</em> names:</h3>
+
+<ul>
+ <li><h4>@configure</h4></li>
+ <h5>Without equivalent, this key is unique to 66 tools.</h5>
+ <p><tt>mandatory</tt> : no</p>
+ <p><tt>syntax</tt> : quotes</p>
+ <p><tt>valid value</tt> :</p>
+ <ul>
+ <p>You can define any arguments to pass to the module's configure script.</p>
+ </ul>
+
+<hr style="border: 1px dashed #000000">
+
+ <li><h4>@directories</h4></li>
+ <h5>Without equivalent, this key is unique to 66 tools.</h5>
+ <p><tt>mandatory</tt> : no</p>
+ <p><tt>syntax</tt> : pair inside bracket</p>
+ <p><tt>valid value</tt> :</p>
+ <ul>
+ <p>Any key=value pair where key is the regex to search on the
+ directory name and value the replacement of that regex. For example:</p>
+ <pre>
+ @directories = ( DM=sddm TRACKER=consolekit )
+ </pre>
+ <p>Where the module directory contains two sub-directories named use-DM and by-TRACKER directories. Its will be renamed as use-sddm and
+ by-consolekit respectively.</p>
+ </ul>
+
+<hr style="border: 1px dashed #000000">
+
+ <li><h4>@files</h4></li>
+ <h5>Without equivalent, this key is unique to 66 tools.</h5>
+ <p><tt>mandatory</tt> : no</p>
+ <p><tt>syntax</tt> : pair inside bracket</p>
+ <p><tt>valid value</tt> :</p>
+ <ul>
+ <p>Reacts exactly as @directories field but on filename instead of
+ directories name.</p>
+ </ul>
+
+<hr style="border: 1px dashed #000000">
+
+ <li><h4>@infiles</h4></li>
+ <h5>Without equivalent, this key is unique to 66 tools.</h5>
+ <p><tt>mandatory</tt> : no</p>
+ <p><tt>syntax</tt> : colon</p>
+ <p><tt>valid value</tt> :</p>
+ <ul>
+ <p>Any valid filename between the double colon with any key=value pair where
+ key is the regex to search inside the file and value the replacement
+ of that regex. The double colon <b>must</b> be present but the name between it
+ can be omitted. In that case, the key=value pair will be apply to
+ all files contained on the module directories and to all key (regex)
+ found inside the same file.For example:</p>
+ <pre>
+ @infiles = ( :mount-tmp:args=-o noexec
+ ::user=@I )
+ </pre>
+ <li>
+ It replaces first the term @I by the name of the module.
+ </li>
+ <li>
+ It opens the file named mount-tmp, search for the args regex
+ and replace it by the value of the regex.
+ </li>
+ <li>
+ It opens all files found on the module directory and replace
+ all regex 'user' found by the name of the module in each file.
+ </li>
+ </ul>
+
+</ul>
+
+<br><hr>
<h2>A word about the @execute key</h2>
@@ -891,7 +1024,7 @@ for it in your <tt>@execute</tt> field.</p>
<br><hr>
-<h2 id="instance">Instance service file creation</h2>
+<h2 id="instance">Instantiated service file creation</h2>
<p>An <em>instance</em> service file is of the same syntax as
decribed in this document for any other service. It can be any <em>type</em>
of service. However some differences exist :
@@ -923,12 +1056,73 @@ for it in your <tt>@execute</tt> field.</p>
@build = auto
@execute = ( agetty -J 38400 tty1 } )</pre>
</p>
-<br><hr>
+<br><hr>
+
+<h2 id="module">Module service creation</h2>
+
+ <p>A module can be considered as an <tt><a href="#instance">instantiated</a></tt>
+ service. It works as the same way concerning the frontend file but
+ allows to configure a set of differents kind of services before executing
+ the enable process. Also, the set of the services can be configured
+ with the conjonction of a script called <tt>configure</tt> which it can be
+ made on any language.</p>
+
+ <p>A module is define with two elements: an instantiated frontend service
+ file at %%service_system%% and a directory at %%service_module%%.
+ The name of the frontend and the name of the directory <b>must</b> be the same.
+ For example if the frontend is named foo@, the directory of the module
+ must be foo@.</p>
+
+ <p>The module directory can contain a sub-directory named <tt>.configure</tt>
+ with an <b>executable</b> file script named <tt>configure</tt> inside. For example,
+ foo@/.configure/configure. The sub-directory <b>must</b> be named
+ <tt>.configure</tt> and the file script <b>must</b> be named <tt>configure</tt>.</p>
+
+ <p>It's up to you to write the <tt>configure</tt> script file with the
+ language of your choice as long as you define a correct <tt>shebang</tt>.</p>
+
+ <p>The <tt>configure</tt> script is launched after the parse of the
+ frontend file meaning all regex on directories and files is already made.</p>
+
+ <h3>A word about the <a href="#main">[main]</a> section with the module type</h3>
+ <p>The valid field in section <a href="#main">[main]</a> are:</p>
+ <ul>
+ <li>
+ @type
+ </li>
+ <li>
+ @description
+ </li>
+ <li>
+ @name
+ </li>
+ <li>
+ @version
+ </li>
+ <li>
+ @user
+ </li>
+ <li>
+ @depends
+ </li>
+ <li>
+ @optsdepends
+ </li>
+ <li>
+ @extdepends
+ </li>
+ <li>
+ @hiercopy
+ </li>
+ </ul>
+ <p>All other fields from <a href="#main">[main]</a> section are not allowed.</p>
+<br><hr>
+
<h2 id="proto">Prototype of a frontend file</h2>
<p>This prototype contain all valid <em>section</em> with all valid <em>key=value</em> pair.</p>
<pre>
[main]
- @type = classic,bundle,longrun,oneshot
+ @type = classic,bundle,longrun,oneshot,module
@name =
@description = ""
@depends = ()
@@ -973,6 +1167,12 @@ for it in your <tt>@execute</tt> field.</p>
[environment]
MYKEY=myvalue
- ANOTHERKEY=!antohervalue
+ ANOTHERKEY=!antohervalue
+
+ [regex]
+ @configure="arguments to pass to configure script"
+ @directories=(key=value)
+ @files=(key=value)
+ @infiles=(:filename:key=value ::key=value)
</pre>
</body></html>
diff --git a/doc/man/66-all.1.scd b/doc/man/66-all.1.scd
index 7d87c7df7bdcaf2b5fc58c25314ceaaf8f77cf2e..4ed15f1414fec86a34d54b653286d5b4dfa6395b 100644
--- a/doc/man/66-all.1.scd
+++ b/doc/man/66-all.1.scd
@@ -6,7 +6,7 @@
# SYNOPSIS
-66-all [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-T* _timeout_ ] [ *-f* ] [ *-t* _tree_ ] *up* | *down*
+66-all [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-T* _timeout_ ] [ *-f* ] [ *-t* _tree_ ] *up* | *down*
# DESCRIPTION
@@ -19,6 +19,9 @@ It is a safe wrapper around *66-start(1)* and *66-stop*(1).
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
diff --git a/doc/man/66-boot.8.scd b/doc/man/66-boot.8.scd
index 1ca09660658ee0a46fc448ccfbb12d08854721c9..44da489167638c853b4c727a049fe5446dea53a3 100644
--- a/doc/man/66-boot.8.scd
+++ b/doc/man/66-boot.8.scd
@@ -17,9 +17,9 @@
Prints this help.
*-s* _skel_
- Path of the skeleton files. By default this will be *%%sysconfdir%%*.
+ Path of the skeleton files. By default this will be *%%skel%%*.
The default can also be changed at compile time by passing the
- *--sysconfdir=*_DIR_ option to *./configure*. This directory *must*
+ *--with-skeleton=*_DIR_ option to *./configure*. This directory *must*
contains the necessaries skeleton files to properly boot the machine, without it the system *will not boot*. _skel_ must be an absolute path.
*-m*
@@ -105,7 +105,7 @@ not arrive.
Skeleton files are mandatories and must exist on your system to be able to boot
and shutdown the machine properly. By default those files are installed at
-*%%sysconfdir%%*. Use the *--sysconfdir=*_DIR_ option at compile time to change
+*%%skel%%*. Use the *--with-skeleton=*_DIR_ option at compile time to change
it.
- *init*++
@@ -142,19 +142,19 @@ name of the _tree_ to start. This _tree_ should contain a set of
_stage2_ will start all other kind of service defined into it. It's the
responsability of the administrator to correctly set this tree.
- - *RCINIT=*_/etc/66/rc.init_++
+ - *RCINIT=*%%skel%%/rc.init_++
This file is launched at the end of the _stage1_ and run as _stage2_.
It call *66-init*(1) to iniatiate all service of _TREE_ except
'classic' which are already initiated on the _stage1_ than invoke
*66-dbctl*(1) to bring up the services. An absolute path is expected as
value pointing to the name of the file to run.
- - *RCSHUTDOWN=*/etc/66/rc.shutdown_++
+ - *RCSHUTDOWN=*%%skel%%/rc.shutdown_++
This is launched when a shutdown is requested also called _stage3_. It invoke
*66-all*(1) to bring down all services of _TREE_. An absolute path is
expected as value pointing to the name of the file to run.
- - *RCSHUTDOWNFINAL=*/etc/66/rc.shutdown_++
+ - *RCSHUTDOWNFINAL=*%%skel%%/rc.shutdown_++
This file will be run at the very end of the shutdown procedure, after
all processes have been killed and all filesystems have been unmounted,
just before the system is rebooted or the power turned off.
@@ -168,7 +168,7 @@ Ask at *s6-svscan* to perform a scan every _RESCAN_ milliseconds. It should
be 0 at _stage1_ but its here just in case. It is strongly discouraged to
set _RESCAN_ to a positive value under 500.
- - *ISHELL=*_/etc/66/ishell_++
+ - *ISHELL=*%%skel%%/ishell_++
Run _ISHELL_ in case of _stage2_ crash. This file try to run a *sulogin*. An
absolute path is expected as value pointing to the name of the file to run.
diff --git a/doc/man/66-dbctl.1.scd b/doc/man/66-dbctl.1.scd
index e3140214d199196a4ebec369e732516a343e3e13..f8fe1ff7a33aa2cb616ab7a496c82a0db55fbe2b 100644
--- a/doc/man/66-dbctl.1.scd
+++ b/doc/man/66-dbctl.1.scd
@@ -6,7 +6,7 @@
# SYNOPSIS
-66-dbctl [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-u* | *d* | *r* ] _service(s)_
+66-dbctl [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-u* | *d* | *r* ] _service(s)_
# DESCRIPTION
@@ -26,6 +26,9 @@ given _tree_.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
diff --git a/doc/man/66-disable.1.scd b/doc/man/66-disable.1.scd
index 36aeb4df056120fe57e10940a1e837a5a1c44e05..cf8bd3cea6aed0ed0cf0ababa2b513dfe613e52e 100644
--- a/doc/man/66-disable.1.scd
+++ b/doc/man/66-disable.1.scd
@@ -6,7 +6,7 @@
# SYNOPSIS
-66-disable [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-S* ] _service_...
+66-disable [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-S* ] _service_...
# DESCRIPTION
@@ -30,6 +30,9 @@ recursively until all dependencies are disabled.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
diff --git a/doc/man/66-enable.1.scd b/doc/man/66-enable.1.scd
index 1832ada4dd58ce829b8a4c25e1726f7d46926942..f1090c1f992771690252780cd4251af159f4303e 100644
--- a/doc/man/66-enable.1.scd
+++ b/doc/man/66-enable.1.scd
@@ -6,14 +6,14 @@
# SYNOPSIS
-66-enable [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-f|F* ] [ *-c|C* ] [ *-S* ] _service_...
+66-enable [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-f|F* ] [ *-c|C* ] [ *-S* ] _service_...
# DESCRIPTION
*66-enable* expects to find a corresponding _frontend service file_ (see
*66-frontend*(5)), a _directory name_ or a _service instance_, by default at
-*%%service_sys%%* or *%%service_packager%%* in this order of precedence for
-root user and *%%service_user%%*, *%%service_sys%%* or *%%service_packager%%*
+*%%service_adm%%* or *%%service_system%%* in this order of precedence for
+root user and *%%service_user%%*, *%%service_adm%%* or *%%service_system%%*
in this order of precedence for a normal user. The default path can be changed
at compile time by passing the --with-sys-service=_DIR_, \--with-packager-service=_DIR_ and --with-user-service=_DIR_ to
*./configure.*
@@ -31,6 +31,9 @@ Multiple _services_ can be enabled by seperating their names with a space.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
@@ -79,7 +82,7 @@ This works recursively until all necessary dependencies are enabled.
# DIRECTORY NAME AS SERVICE
When choosing to make a directory be recognised as service the path of the
-directory must exist by default at *%%service_sys%%*, *%%service_packager%%*
+directory must exist by default at *%%service_adm%%*, *%%service_system%%*
or *$HOME/%%service_user%%* depending of the owner of the process.
All _service_ files found in this directory will be enabled. This process
is done recursively if a sub-directory is found till it not found other
@@ -115,7 +118,7 @@ frontend service file.
## SERVICE CONFIGURATION FILE
If the *[environment]* section is set on the frontend service file, the parse
-result process can be found by default at *%%service_sysconf%%* for the root
+result process can be found by default at *%%service_admconf%%* for the root
user and *$HOME/%%service_userconf%%* for a normal user. The default path can
be changed at compile time by passing the --with-sys-service-conf=_DIR_ for the
root user and --with-user-service-conf=_DIR_ for a normal user.
diff --git a/doc/man/66-env.1.scd b/doc/man/66-env.1.scd
index e68a1362298ba8a6c56bbf22d2d9d1be7a6f50b8..009a11194a059ffe741800f5d205d1b0e7244668 100644
--- a/doc/man/66-env.1.scd
+++ b/doc/man/66-env.1.scd
@@ -7,12 +7,12 @@ on the options passed.
# SYNOPSIS
-66-env [ *-h* ] [ *-v* _verbosity_ ] [ *-t* _tree_ ] [ *-d* _dir_ ] [ *-L* ] [ *-r* _key=value_ ] _service_
+66-env [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-t* _tree_ ] [ *-d* _dir_ ] [ *-L* ] [ *-r* _key=value_ ] _service_
# DESCRIPTION
*66-env* open and read the configuration file of _service_ find at
-*%%service_sysconf%%* by default.
+*%%service_admconf%%* by default.
It display the contain of the file or replace a _key=value_ pair if requested.
@@ -21,6 +21,9 @@ It display the contain of the file or replace a _key=value_ pair if requested.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only print error messages.++
diff --git a/doc/man/66-hpr.8.scd b/doc/man/66-hpr.8.scd
index 44047758f60df5baa671076a281400408bef335b..d24e773cbe36d9c72e8ebef68ee0229a07778978 100644
--- a/doc/man/66-hpr.8.scd
+++ b/doc/man/66-hpr.8.scd
@@ -14,7 +14,7 @@
hardware shutdown with the *-f* option.
It is normally invoked through *halt*, *poweroff* or *reboot* wrappers
-installed by default at *%%sysconfdir%%*.
+installed by default at *%%skel%%*.
This program is a modified copy of *s6-linux-init-hpr* program.
diff --git a/doc/man/66-init.1.scd b/doc/man/66-init.1.scd
index a33dbc2d5a0de57d87d1180f9e8439d14f01c63b..4ae518be712dea4fa8d183c4f0338f15a7058307 100644
--- a/doc/man/66-init.1.scd
+++ b/doc/man/66-init.1.scd
@@ -5,7 +5,7 @@
# SYNOPSYS
-66-init [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] *classic* | *database* | *both*
+66-init [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] *classic* | *database* | *both*
# DESCRIPTION
@@ -20,6 +20,9 @@ Administrators should invoke *66-init* only once.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
diff --git a/doc/man/66-inservice.1.scd b/doc/man/66-inservice.1.scd
index 3c404e025f340a72dc884b2345479119fbf77046..2671419641f8c93269bdd9e09de3087240782122 100644
--- a/doc/man/66-inservice.1.scd
+++ b/doc/man/66-inservice.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-inservice [ *-h* ] [ *-v* _verbosity_ ] [ *-c* ] -[ *-n* ] [ *-o* _name,intree,enabled,..._ ] [ *-g* ] [ *-d* _depth_ ] [ *-r* ] [ *-t* _tree_ ] [ *-p* _nline_ ] _service_
+66-inservice [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-n* ] [ *-o* _name,intree,enabled,..._ ] [ *-g* ] [ *-d* _depth_ ] [ *-r* ] [ *-t* _tree_ ] [ *-p* _nline_ ] _service_
# DESCRIPTION
@@ -17,6 +17,9 @@
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only prints error messages.++
@@ -24,9 +27,6 @@
*3* : Also prints tracing messages.++
*4* : Also prints debugging messages.
-*-c*
- enable colorization.
-
*-n*
do not display the field name(s) specified.
@@ -116,7 +116,7 @@ In tree : boot
Status : enabled, nothing to display
Type : bundle
Description : Set the hostname and mount filesystem
-Source : %%service_packager%%/boot/mount/00
+Source : %%service_system%%/boot/mount/00
Live : %%livedir%%/tree/0/boot/servicedirs/00
Dependencies : system-hostname mount-run populate-run mount-tmp
populate-tmp mount-proc mount-sys populate-sys
diff --git a/doc/man/66-intree.1.scd b/doc/man/66-intree.1.scd
index cf5dc03f61a975107afd0aed4b86cb1a90ef9167..4d4ab76349fe41c015b27f4a18edd778329624f3 100644
--- a/doc/man/66-intree.1.scd
+++ b/doc/man/66-intree.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-intree [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-c* ] [ *-n* ] [ *-o* name,init,enabled,... ] [ *-g* ] [ *-d* _depth_ ] [ *-r* ] _tree_
+66-intree [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-n* ] [ *-o* name,init,enabled,... ] [ *-g* ] [ *-d* _depth_ ] [ *-r* ] _tree_
# DESCRIPTION
@@ -17,6 +17,9 @@
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only prints error messages.++
@@ -31,9 +34,6 @@
existing absolute path is expected and should be within a writable
filesystem - likely a RAM filesystem. See *66-scandir*(1).
-*-c*
- enable colorization.
-
*-n*
do not display the field name(s) specified.
diff --git a/doc/man/66-parser.1.scd b/doc/man/66-parser.1.scd
index c70570121f8ebcf4d225eb9cc44838ffd29c5721..39755ba41b7073419f9f999852bad7f74c324a54 100644
--- a/doc/man/66-parser.1.scd
+++ b/doc/man/66-parser.1.scd
@@ -6,7 +6,7 @@
# SYNOPSIS
-66-parser [ *-h* ] [ *-v* _verbosity_ ] [ *-f* ] [ *-c* | *-C* ] _service destination_
+66-parser [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-f* ] [ *-c* | *-C* ] _service destination_
# DESCRIPTION
@@ -21,6 +21,9 @@ An absolute path is expected for _service_ and _destination_.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
@@ -43,7 +46,7 @@ An absolute path is expected for _service_ and _destination_.
key of the given frontend file. This tool is maily intended for debugging
purpose and to see the result of a parsing process before actually enabling
the service on the system. This tool use the exact same parser as *66-enable*
-which by default writes the configuration file to *%%service_sysconf%%*/_service_name_.
+which by default writes the configuration file to *%%service_admconf%%*/_service_name_.
That's mean that a corresponding file will be overwritten. To avoid this,
it writes the configuration file at _destination/env/_ directory and adjust
the resulting *run/finish* file to match the configuration file path.
diff --git a/doc/man/66-scanctl.1.scd b/doc/man/66-scanctl.1.scd
index f5e3dfc2c3f0d3680ec98240b3afc1f4c3b6061a..a366a73804d89df2e64932b9f9ae8f29a71f6758 100644
--- a/doc/man/66-scanctl.1.scd
+++ b/doc/man/66-scanctl.1.scd
@@ -6,7 +6,7 @@
# SYNOPSIS
-66-scanctl [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-o* _owner_ ] _signal_
+66-scanctl [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-o* _owner_ ] _signal_
# DESCRIPTION
@@ -22,6 +22,9 @@ the current process will be used instead.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
- *1* : (Default) Only print error messages.++
diff --git a/doc/man/66-scandir.1.scd b/doc/man/66-scandir.1.scd
index d5291f180376407ab3be5e61b32f5aadfb8efe42..f9e6df2b871fe41e747322405222be4399ecb71c 100644
--- a/doc/man/66-scandir.1.scd
+++ b/doc/man/66-scandir.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-scandir [ *-h* ] [ *-v* _verbosity_ ] [ *-b* ] [ *-l* _live_ ] [* -t* _rescan_ ] [ *-L* _log_user_ ] [ *-s* _skel_ ] [ *-e* _environment_ ] [ *-c* | *-r* | *-u* ] _owner_
+66-scandir [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-b* ] [ *-l* _live_ ] [* -t* _rescan_ ] [ *-L* _log_user_ ] [ *-s* _skel_ ] [ *-e* _environment_ ] [ *-c* | *-r* | *-u* ] _owner_
# DESCRIPTION
@@ -22,6 +22,9 @@ explicitely set then the user of the current process will be used instead.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only print error messages.++
@@ -56,7 +59,7 @@ explicitely set then the user of the current process will be used instead.
*-s* _skel_
An absolute path. Directory containing _skeleton_ files. This option is
not meant to be used directly even with root. *66-boot*(8) program calls it
- at during the boot process.
+ at during the boot process. Default is %%skel%%.
*-L* _log_user_
Will run as the catch-all logger as _log_user_ user. Default is *%%s6log_user%%*.
diff --git a/doc/man/66-shutdown.8.scd b/doc/man/66-shutdown.8.scd
index 5ef339987bf8cbed24a2a2dc87ea1721e2f353af..ca600ae638a116b4de2eb1788259c962fc1795bb 100644
--- a/doc/man/66-shutdown.8.scd
+++ b/doc/man/66-shutdown.8.scd
@@ -49,8 +49,8 @@ _time_ must follow the following format: [ *now* | [+]_mins_ | _hh_:_mm_ ]
*-a*
Access control. The shutdown sequence will only be launched if one of the
- users listed in */etc/shutdown.allow* is currently logged in (as tracked by
- utmp). */etc/shutdown.allow* is a text file which accepts one user per
+ users listed in *%%skel%%/shutdown.allow* is currently logged in (as tracked by
+ utmp). *%%skel%%/shutdown.allow* is a text file which accepts one user per
line. Lines starting with *#* are comments.
*-t* _sec_
@@ -87,7 +87,7 @@ _time_ must follow the following format: [ *now* | [+]_mins_ | _hh_:_mm_ ]
- The *66-shutdown* binary is not meant to be called directly. It shuold
always be referenced by the *shutdown* _skeloton_ file installed by default
- at *%%sysconfdir%%* directory. The binary *should be copied or symlinked* by
+ at *%%skel%%* directory. The binary *should be copied or symlinked* by
the administrator into the binary directory of your system.
- *-f* and *-F* options are only accepted for compatibility. LSB says they are
diff --git a/doc/man/66-shutdownd.8.scd b/doc/man/66-shutdownd.8.scd
index eb3bc65228b6ada7729a13198a7eee0f04ca5694..f25971dc973989f32abb459f4826a2661eb1a3a4 100644
--- a/doc/man/66-shutdownd.8.scd
+++ b/doc/man/66-shutdownd.8.scd
@@ -17,7 +17,7 @@ It is not meant to be called directly by the user. This program is a modified co
they are told to trigger the shutdown procedure.
- When it receives a command to shut down, *66-shutdownd* parses the _skel_
- file _rc.init_ define by default at *%%sysconfdir%%* directory and reads the
+ file _rc.init_ define by default at *%%skel%%* directory and reads the
value of *RCSHUTDOWN* variable to be able to spawns the _rc.shutdown_ script.
- When said script exits, *66-shutdownd* kills all processes with a
@@ -42,7 +42,7 @@ It is not meant to be called directly by the user. This program is a modified co
*-s* _skel_
An abdolute path. Directory of the skeleton file _rc.init_. Default is
- *%%sysconfdir%%*.
+ *%%skel%%*.
*-g* _gracetime_
Specify a grace time between the SIGTERM and the SIGKILLin milliseconds if
diff --git a/doc/man/66-start.1.scd b/doc/man/66-start.1.scd
index f94678c6da952cfcdc0dd3fd09632f5632aab1fb..1dcc99669624229a72290cd94ba039221925bdac 100644
--- a/doc/man/66-start.1.scd
+++ b/doc/man/66-start.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-start [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-r* | *-R* ] _service..._
+66-start [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-r* | *-R* ] _service..._
# DESCRIPTION
@@ -22,6 +22,9 @@ Multiple _services_ can be started by seperating their names with a space.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only print error messages.++
diff --git a/doc/man/66-stop.1.scd b/doc/man/66-stop.1.scd
index c3750ba5dbc25d8327c8aa5b8cf17669d6d32138..f46d7dced07f177f4de8ccd6174bb8271127c48d 100644
--- a/doc/man/66-stop.1.scd
+++ b/doc/man/66-stop.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-stop [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-u* ] [ *-X* ] [ *-K* ] _service..._
+66-stop [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-u* ] [ *-X* ] [ *-K* ] _service..._
# DESCRIPTION
@@ -21,6 +21,9 @@ Multiple _services_ can be stopped by seperating their names with a space.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only print error messages.++
diff --git a/doc/man/66-svctl.1.scd b/doc/man/66-svctl.1.scd
index ff851a4d63983b808dfb4421b6853cee61aaee85..b5c48d9e662015aec1963cd5cae88bb55e299548 100644
--- a/doc/man/66-svctl.1.scd
+++ b/doc/man/66-svctl.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-svctl [ *-h* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-n* _death_ ] [ *-u* | *-d* | *-r* | *-K* | *-X* ] _service..._
+66-svctl [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-t* _tree_ ] [ *-T* _timeout_ ] [ *-n* _death_ ] [ *-u* | *-d* | *-r* | *-K* | *-X* ] _service..._
# DESCRIPTION
@@ -24,6 +24,9 @@ The command is sent to the _selection_ asynchronously.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only print error messages.++
diff --git a/doc/man/66-tree.1.scd b/doc/man/66-tree.1.scd
index 355c86a1ecdd70f67ed2e3dc0d85dfc8d343a653..e05ef76477cf8da896d97a3f46d670437b4b476e 100644
--- a/doc/man/66-tree.1.scd
+++ b/doc/man/66-tree.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-tree [ *-h* ] [ *-v* _verbosity_ ] [ -l ] [ *-n* | *-R* ] [ *-a* | *-d* ] [ *-c* _clone_ ] [ *-S* _after_tree_ ] [ *-E* | *-D* ] [ *-U* ] [ *-C* ] _tree_
+66-tree [ *-h* ] [ *-z* ] [ *-v* _verbosity_ ] [ -l ] [ *-n* | *-R* ] [ *-a* | *-d* ] [ *-c* _clone_ ] [ *-S* _after_tree_ ] [ *-E* | *-D* ] [ *-U* ] [ *-C* ] _tree_
# DESCRIPTION
@@ -20,6 +20,9 @@ what trees are currently available on the system use the *66-intree*(1) tool.
*-h*
Prints this help.
+*-z*
+ use color.
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only prints error messages.++
@@ -68,6 +71,7 @@ what trees are currently available on the system use the *66-intree*(1) tool.
Enables _tree_. This allows the *66-all*(1) tool to know which tree needs to
be started. If the given _tree_ is enabled, all services in that tree will be
started when you use the *66-all*(1) tool.
+ *Note*: If *after_tree* and *tree* have the same name, then this *tree* will be the very first tree to start.
*-D*
Disables _tree_. The exact opposite of the *-E* option.
diff --git a/doc/man/66-update.1.scd b/doc/man/66-update.1.scd
index 410a3dfd798f72b6906c57ef8e1d29a68ebd53c5..a0b425e1628c8e004296b060f8e1ec506c0854b1 100644
--- a/doc/man/66-update.1.scd
+++ b/doc/man/66-update.1.scd
@@ -6,7 +6,7 @@
# SYNOPSYS
-66-update [ *-h* ] [ *-v* _verbosity_ ] [* -c* ] [ *-l* _live_ ] [ *-d* ] _tree_
+66-update [ *-h* ] [*-z* ] [ *-v* _verbosity_ ] [ *-l* _live_ ] [ *-d* ] _tree_
# DESCRIPTION
@@ -25,6 +25,9 @@ without needing a reboot.
*-h*
Prints this help.
+*-z*
+ use color
+
*-v* _verbosity_
Increases/decreases the verbosity of the command.++
*1* : (Default) Only prints error messages.++
@@ -32,9 +35,6 @@ without needing a reboot.
*3* : Also prints tracing messages.++
*4* : Also prints debugging messages.
-*-c*
- enable colorization
-
*-l* _live_
An absolute path. Create the scandir at _live_. Default is *%%livedir%%*.
The default can also be changed at compile-time by passing the
diff --git a/package/deps.mak b/package/deps.mak
index 2d22723f25a7457b360d5a4e2d7b730c13e8eda2..200a42a1e2803ae5cef93507d9102a64f775522f 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -35,7 +35,7 @@ src/66/66-svctl.o src/66/66-svctl.lo: src/66/66-svctl.c src/include/66/ssexec.h
src/66/66-tree.o src/66/66-tree.lo: src/66/66-tree.c src/include/66/config.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/resolve.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
src/66/66-update.o src/66/66-update.lo: src/66/66-update.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/parser.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
src/extra-tools/66-echo.o src/extra-tools/66-echo.lo: src/extra-tools/66-echo.c
-src/extra-tools/66-umountall.o src/extra-tools/66-umountall.lo: src/extra-tools/66-umountall.c
+src/extra-tools/66-umountall.o src/extra-tools/66-umountall.lo: src/extra-tools/66-umountall.c src/include/66/config.h
src/lib66/backup_cmd_switcher.o src/lib66/backup_cmd_switcher.lo: src/lib66/backup_cmd_switcher.c src/include/66/constants.h src/include/66/enum.h src/include/66/ssexec.h src/include/66/utils.h
src/lib66/backup_make_new.o src/lib66/backup_make_new.lo: src/lib66/backup_make_new.c src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/tree.h src/include/66/utils.h
src/lib66/backup_realpath_sym.o src/lib66/backup_realpath_sym.lo: src/lib66/backup_realpath_sym.c src/include/66/constants.h src/include/66/enum.h src/include/66/ssexec.h src/include/66/utils.h
diff --git a/package/info b/package/info
index 7b72f21ad8fda274fddca31c0b8caf9b0e577cf6..f5a2e2f98e3db8cef3751e072411438b808bbe2a 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=66
-version=0.2.5.0
+version=0.2.5.2
category=admin
package_macro_name=SS
diff --git a/src/66/66-all.c b/src/66/66-all.c
index 5b302964e23e69547bf94f148b40312ef6656aa4..55c8a0eb857e3cf5dbe5e98019e32f83126c0c27 100644
--- a/src/66/66-all.c
+++ b/src/66/66-all.c
@@ -36,7 +36,7 @@
static unsigned int DEADLINE = 0 ;
unsigned int trc = 0 ;
-#define USAGE "66-all [ -h ] [ -v verbosity ] [ -f ] [ -T timeout ] [ -l live ] [ -t tree ] up/down"
+#define USAGE "66-all [ -h ] [ -z ] [ -v verbosity ] [ -f ] [ -T timeout ] [ -l live ] [ -t tree ] up/down"
static inline void info_help (void)
{
@@ -44,7 +44,8 @@ static inline void info_help (void)
"66-all <options> up/down\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -T: timeout\n"
" -l: live directory\n"
@@ -156,6 +157,8 @@ int main(int argc, char const *const *argv,char const *const *envp)
size_t statesize, statelen, pos = 0 ;
char const *treename = NULL ;
+ log_color = &log_color_disable ;
+
stralloc base = STRALLOC_ZERO ;
stralloc scandir = STRALLOC_ZERO ;
stralloc livetree = STRALLOC_ZERO ;
@@ -172,7 +175,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:l:T:t:f", &l) ;
+ int opt = getopt_args(argc,argv, ">hv:l:T:t:fz", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
@@ -185,6 +188,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
case 'T' : if (!uint0_scan(l.arg, &DEADLINE)) log_usage(USAGE) ; break ;
case 't' : treename = l.arg ; break ;
case 'f' : shut = 1 ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
default : log_usage(USAGE) ;
}
}
diff --git a/src/66/66-inservice.c b/src/66/66-inservice.c
index e69120ce26193709c3f1a119a318ff83b66ece61..c603fd2e770b5c3811f74b36bc5ef905add06ad4 100644
--- a/src/66/66-inservice.c
+++ b/src/66/66-inservice.c
@@ -47,20 +47,20 @@
static unsigned int REVERSE = 0 ;
static unsigned int NOFIELD = 1 ;
-unsigned int MAXDEPTH = 1 ;
static unsigned int GRAPH = 0 ;
static char const *const *ENVP ;
static unsigned int nlog = 20 ;
static stralloc src = STRALLOC_ZERO ;
static wchar_t const field_suffix[] = L" :" ;
-static char fields[ENDOFKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
+static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
static void info_display_string(char const *str) ;
static void info_display_name(char const *field, ss_resolve_t *res) ;
static void info_display_intree(char const *field, ss_resolve_t *res) ;
static void info_display_status(char const *field, ss_resolve_t *res) ;
static void info_display_type(char const *field, ss_resolve_t *res) ;
static void info_display_description(char const *field, ss_resolve_t *res) ;
+static void info_display_version(char const *field, ss_resolve_t *res) ;
static void info_display_source(char const *field, ss_resolve_t *res) ;
static void info_display_live(char const *field, ss_resolve_t *res) ;
static void info_display_deps(char const *field, ss_resolve_t *res) ;
@@ -79,30 +79,31 @@ ss_resolve_graph_style *STYLE = &graph_default ;
info_opts_map_t const opts_sv_table[] =
{
{ .str = "name", .svfunc = &info_display_name, .id = 0 },
- { .str = "intree", .svfunc = &info_display_intree, .id = 1 },
- { .str = "status", .svfunc = &info_display_status, .id = 2 },
- { .str = "type", .svfunc = &info_display_type, .id = 3 },
- { .str = "description", .svfunc = &info_display_description, .id = 4 },
- { .str = "source", .svfunc = &info_display_source, .id = 5 },
- { .str = "live", .svfunc = &info_display_live, .id = 6 },
- { .str = "depends", .svfunc = &info_display_deps, .id = 7 },
- { .str = "optsdepends", .svfunc = &info_display_optsdeps, .id = 8 },
- { .str = "extdepends", .svfunc = &info_display_extdeps, .id = 9 },
- { .str = "start", .svfunc = &info_display_start, .id = 10 },
- { .str = "stop", .svfunc = &info_display_stop, .id = 11 },
- { .str = "envat", .svfunc = &info_display_envat, .id = 12 },
- { .str = "envfile", .svfunc = &info_display_envfile, .id = 13 },
- { .str = "logname", .svfunc = &info_display_logname, .id = 14 },
- { .str = "logdst", .svfunc = &info_display_logdst, .id = 15 },
- { .str = "logfile", .svfunc = &info_display_logfile, .id = 16 },
+ { .str = "version", .svfunc = &info_display_version, .id = 1 },
+ { .str = "intree", .svfunc = &info_display_intree, .id = 2 },
+ { .str = "status", .svfunc = &info_display_status, .id = 3 },
+ { .str = "type", .svfunc = &info_display_type, .id = 4 },
+ { .str = "description", .svfunc = &info_display_description, .id = 5 },
+ { .str = "source", .svfunc = &info_display_source, .id = 6 },
+ { .str = "live", .svfunc = &info_display_live, .id = 7 },
+ { .str = "depends", .svfunc = &info_display_deps, .id = 8 },
+ { .str = "optsdepends", .svfunc = &info_display_optsdeps, .id = 9 },
+ { .str = "extdepends", .svfunc = &info_display_extdeps, .id = 10 },
+ { .str = "start", .svfunc = &info_display_start, .id = 11 },
+ { .str = "stop", .svfunc = &info_display_stop, .id = 12 },
+ { .str = "envat", .svfunc = &info_display_envat, .id = 13 },
+ { .str = "envfile", .svfunc = &info_display_envfile, .id = 14 },
+ { .str = "logname", .svfunc = &info_display_logname, .id = 15 },
+ { .str = "logdst", .svfunc = &info_display_logdst, .id = 16 },
+ { .str = "logfile", .svfunc = &info_display_logfile, .id = 17 },
{ .str = 0, .svfunc = 0, .id = -1 }
} ;
-#define MAXOPTS 18
+#define MAXOPTS 19
#define checkopts(n) if (n >= MAXOPTS) strerr_dief1x(100, "too many options")
#define DELIM ','
-#define USAGE "66-inservice [ -h ] [ -v verbosity ] [ -c ] [ -n ] [ -o name,intree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] service"
+#define USAGE "66-inservice [ -h ] [ -z ] [ -v verbosity ] [ -n ] [ -o name,intree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] service"
static inline void info_help (void)
{
@@ -111,8 +112,8 @@ static inline void info_help (void)
"\n"
"options :\n"
" -h: print this help\n"
-" -v: increase/decrease verbosity\n"
" -c: use color\n"
+" -v: increase/decrease verbosity\n"
" -n: do not display the field name\n"
" -o: comma separated list of field to display\n"
" -g: displays the contents field as graph\n"
@@ -124,6 +125,7 @@ static inline void info_help (void)
"valid field for -o options are:\n"
"\n"
" name: displays the name\n"
+" version: displays the version of the service\n"
" intree: displays the service's tree name\n"
" status: displays the status\n"
" type: displays the service type\n"
@@ -195,6 +197,21 @@ static void info_display_name(char const *field, ss_resolve_t *res)
info_display_string(res->sa.s + res->name) ;
}
+static void info_display_version(char const *field,ss_resolve_t *res)
+{
+ if (NOFIELD) info_display_field_name(field) ;
+ /** tempory check here, it not mandatory for the moment*/
+ if (res->version > 0)
+ {
+ info_display_string(res->sa.s + res->version) ;
+ }
+ else
+ {
+ if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
+ log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
+ }
+}
+
static void info_display_intree(char const *field,ss_resolve_t *res)
{
if (NOFIELD) info_display_field_name(field) ;
@@ -208,7 +225,7 @@ static void info_get_status(ss_resolve_t *res)
pid_t pid ;
- if (res->type == CLASSIC || res->type == LONGRUN)
+ if (res->type == TYPE_CLASSIC || res->type == TYPE_LONGRUN)
{
r = s6_svc_ok(res->sa.s + res->runat) ;
if (r != 1)
@@ -256,7 +273,7 @@ static void info_display_status(char const *field,ss_resolve_t *res)
static void info_display_type(char const *field,ss_resolve_t *res)
{
if (NOFIELD) info_display_field_name(field) ;
- info_display_string(get_keybyid(res->type)) ;
+ info_display_string(get_key_by_enum(ENUM_TYPE,res->type)) ;
}
static void info_display_description(char const *field,ss_resolve_t *res)
@@ -299,8 +316,6 @@ static void info_display_deps(char const *field, ss_resolve_t *res)
}
else
{
- //if (!bprintf(buffer_1,"%s"," "))
- // log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!sastr_clean_string(&salist,res->sa.s + res->deps))
log_dieu(LOG_EXIT_SYS,"build dependencies list") ;
if (REVERSE)
@@ -454,7 +469,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
static void info_display_logname(char const *field,ss_resolve_t *res)
{
if (NOFIELD) info_display_field_name(field) ;
- if (res->type == CLASSIC || res->type == LONGRUN)
+ if (res->type == TYPE_CLASSIC || res->type == TYPE_LONGRUN)
{
if (res->logger)
{
@@ -473,9 +488,9 @@ static void info_display_logname(char const *field,ss_resolve_t *res)
static void info_display_logdst(char const *field,ss_resolve_t *res)
{
if (NOFIELD) info_display_field_name(field) ;
- if (res->type == CLASSIC || res->type == LONGRUN)
+ if (res->type != TYPE_BUNDLE || res->type != TYPE_MODULE)
{
- if (res->logger)
+ if (res->logger || (res->type == TYPE_ONESHOT && res->dstlog))
{
info_display_string(res->sa.s + res->dstlog) ;
}
@@ -492,9 +507,9 @@ static void info_display_logdst(char const *field,ss_resolve_t *res)
static void info_display_logfile(char const *field,ss_resolve_t *res)
{
if (NOFIELD) info_display_field_name(field) ;
- if (res->type == CLASSIC || res->type == LONGRUN)
+ if (res->type != TYPE_BUNDLE || res->type != TYPE_MODULE)
{
- if (res->logger)
+ if (res->logger || (res->type == TYPE_ONESHOT && res->dstlog))
{
if (nlog)
{
@@ -505,7 +520,6 @@ static void info_display_logfile(char const *field,ss_resolve_t *res)
memcpy(scan,res->sa.s + res->dstlog,dstlen) ;
memcpy(scan + dstlen,"/current",8) ;
scan[dstlen + 8] = 0 ;
-
int r = scan_mode(scan,S_IFREG) ;
if (r < 0) { errno = EEXIST ; log_diesys(LOG_EXIT_SYS,"conflicting format of: ",scan) ; }
if (!r)
@@ -516,7 +530,7 @@ static void info_display_logfile(char const *field,ss_resolve_t *res)
else
{
if (!file_readputsa(&log,res->sa.s + res->dstlog,"current")) log_dieusys(LOG_EXIT_SYS,"read log file of: ",res->sa.s + res->name) ;
- if (log.len < 10)
+ if (log.len < 10 && res->type != TYPE_ONESHOT)
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off)) goto err ;
}
@@ -605,6 +619,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
char buf[MAXOPTS][INFO_FIELD_MAXLEN] = {
"Name",
+ "Version" ,
"In tree",
"Status",
"Type",
@@ -628,14 +643,14 @@ int main(int argc, char const *const *argv, char const *const *envp)
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:cno:grd:t:p:", &l) ;
+ int opt = getopt_args(argc,argv, ">hzv:cno:grd:t:p:", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
{
case 'h' : info_help(); return 0 ;
case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) log_usage(USAGE) ; break ;
- case 'c' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'n' : NOFIELD = 0 ; break ;
case 'o' : legacy = 0 ; info_parse_options(l.arg,what) ; break ;
case 'g' : GRAPH = 1 ; break ;
@@ -643,6 +658,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
case 'd' : if (!uint0_scan(l.arg, &MAXDEPTH)) log_usage(USAGE) ; break ;
case 't' : tname = l.arg ; break ;
case 'p' : if (!uint0_scan(l.arg, &nlog)) log_usage(USAGE) ; break ;
+ case 'c' : log_die(LOG_EXIT_SYS,"deprecated option -- please use -z instead") ;
default : log_usage(USAGE) ;
}
}
diff --git a/src/66/66-intree.c b/src/66/66-intree.c
index 2a4cdfa41612c9b54db7485abd316198333371b0..bd7fc5b84a686b359dacbf7c96c9d869df5347bf 100644
--- a/src/66/66-intree.c
+++ b/src/66/66-intree.c
@@ -42,7 +42,6 @@
static unsigned int REVERSE = 0 ;
static unsigned int NOFIELD = 1 ;
-unsigned int MAXDEPTH = 1 ;
static unsigned int GRAPH = 0 ;
static uid_t OWNER ;
static char OWNERSTR[UID_FMT] ;
@@ -52,7 +51,7 @@ static stralloc live = STRALLOC_ZERO ;
static stralloc src = STRALLOC_ZERO ;
static wchar_t const field_suffix[] = L" :" ;
-static char fields[ENDOFKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
+static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
static void info_display_name(char const *field,char const *treename) ;
static void info_display_init(char const *field,char const *treename) ;
static void info_display_order(char const *field,char const *treename) ;
@@ -80,7 +79,7 @@ info_opts_map_t const opts_tree_table[] =
#define checkopts(n) if (n >= MAXOPTS) log_die(100, "too many options")
#define DELIM ','
-#define USAGE "66-intree [ -h ] [ -v verbosity ] [ -l live ] [ -c ] [ -n ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] tree"
+#define USAGE "66-intree [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -n ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] tree"
static inline void info_help (void)
{
@@ -89,9 +88,9 @@ static inline void info_help (void)
"\n"
"options :\n"
" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
-" -c: use color\n"
" -n: do not display the names of fields\n"
" -o: comma separated list of field to display\n"
" -g: displays the contents field as graph\n"
@@ -178,7 +177,7 @@ static void info_display_init(char const *field,char const *treename)
if (!bprintf(buffer_1,"%s%s%s",init ? log_color->valid : log_color->warning, init ? "yes":"no",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
- if (buffer_putsflush(buffer_1,"\n") == -1)
+ if (buffer_putsflush(buffer_1,"\n") == -1)
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
@@ -191,7 +190,7 @@ static void info_display_current(char const *field,char const *treename)
if (tree_find_current(&sacurr,base.s,OWNER))
{
char name[sacurr.len + 1] ;//be paranoid +1
- if (!basename(name,sacurr.s)) log_dieu(LOG_EXIT_SYS,"basename of: ",sacurr.s) ;
+ if (!ob_basename(name,sacurr.s)) log_dieu(LOG_EXIT_SYS,"basename of: ",sacurr.s) ;
current = obstr_equal(treename,name) ;
}
if (NOFIELD) info_display_field_name(field) ;
@@ -322,24 +321,24 @@ static void info_display_symlink(char const *field, char const *treename)
ssexec_t info = SSEXEC_ZERO ;
if (!auto_stra(&info.treename,treename)) log_die_nomem("stralloc") ;
if (!auto_stra(&info.base,base.s)) log_die_nomem("stralloc") ;
- int db, svc ;
+ int db , svc ;
size_t typelen ;
char type[UINT_FMT] ;
- typelen = uint_fmt(type, BUNDLE) ;
+ typelen = uint_fmt(type, TYPE_BUNDLE) ;
type[typelen] = 0 ;
char cmd[typelen + 6 + 1] ;
auto_strings(cmd,"-t",type," -b") ;
db = backup_cmd_switcher(VERBOSITY,cmd,&info) ;
- if (db < 0) log_dieusys(LOG_EXIT_SYS,"find realpath of symlink for db of tree: ",info.treename.s) ;
+ if (db < 0) log_dieu(LOG_EXIT_SYS,"find realpath of symlink for db of tree: ",info.treename.s) ;
- typelen = uint_fmt(type, CLASSIC) ;
+ typelen = uint_fmt(type, TYPE_CLASSIC) ;
type[typelen] = 0 ;
auto_strings(cmd,"-t",type," -b") ;
svc = backup_cmd_switcher(VERBOSITY,cmd,&info) ;
- if (svc < 0) log_dieusys(LOG_EXIT_SYS,"find realpath of symlink for svc of tree: ",info.treename.s) ;
+ if (svc < 0) log_dieu(LOG_EXIT_SYS,"find realpath of symlink for svc of tree: ",info.treename.s) ;
if (!bprintf(buffer_1,"%s%s%s%s%s%s%s%s", "svc->",!svc ? log_color->valid : log_color->warning , !svc ? "source" : "backup",log_color->off, " db->", !db ? log_color->valid : log_color->warning, !db ? "source" : "backup", log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
@@ -499,14 +498,14 @@ int main(int argc, char const *const *argv, char const *const *envp)
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:cno:grd:l:", &l) ;
+ int opt = getopt_args(argc,argv, ">hzv:no:grd:l:c", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
{
case 'h' : info_help(); return 0 ;
case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) log_usage(USAGE) ; break ;
- case 'c' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'n' : NOFIELD = 0 ; break ;
case 'o' : legacy = 0 ; info_parse_options(l.arg,what) ; break ;
case 'g' : GRAPH = 1 ; break ;
@@ -515,6 +514,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
case 'l' : if (!stralloc_cats(&live,l.arg)) log_usage(USAGE) ;
if (!stralloc_0(&live)) log_usage(USAGE) ;
break ;
+ case 'c' : log_die(LOG_EXIT_SYS,"deprecated option -- please use -z instead") ;
default : log_usage(USAGE) ;
}
}
diff --git a/src/66/66-parser.c b/src/66/66-parser.c
index 17da06cb5771efe5ab7edbecffa97753cdb16077..1e001cc0973645bde9dd3c871fe961b7239d3e4b 100644
--- a/src/66/66-parser.c
+++ b/src/66/66-parser.c
@@ -34,7 +34,7 @@
#include <66/parser.h>
#include <66/constants.h>
-#define USAGE "66-parser [ -h ] [ -v verbosity ] [ -f ] [ -c|C ] service destination"
+#define USAGE "66-parser [ -h ] [ -z ] [ -v verbosity ] [ -f ] [ -c|C ] service destination"
static inline void info_help (void)
{
@@ -42,7 +42,8 @@ static inline void info_help (void)
"66-parser <options> service destination\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -f: force to overwrite existing destination\n"
" -c: merge it environment configuration file from frontend file\n"
@@ -82,15 +83,18 @@ int main(int argc, char const *const *argv,char const *const *envp)
char const *sv ;
char name[4095+1] ;
char srcdir[4095+1] ;
- int type ;
+ unsigned int type ;
uint8_t force = 0 , conf = 0 ;
+
+ log_color = &log_color_disable ;
+
PROG = "66-parser" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:fcC", &l) ;
+ int opt = getopt_args(argc,argv, ">hv:fcCz", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
@@ -100,6 +104,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
case 'f' : force = 1 ; break ;
case 'c' : if (conf) log_usage(USAGE) ; conf = 1 ; break ;
case 'C' : if (conf) log_usage(USAGE) ; conf = 2 ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
default : log_usage(USAGE) ;
}
}
@@ -110,11 +115,15 @@ int main(int argc, char const *const *argv,char const *const *envp)
sv = argv[0] ;
dir = argv[1] ;
+
if (dir[0] != '/') log_die(LOG_EXIT_USER, "directory: ",dir," must be an absolute path") ;
if (sv[0] != '/') log_die(LOG_EXIT_USER, "service: ",sv," must be an absolute path") ;
- if (!basename(name,sv)) log_dieu(LOG_EXIT_SYS,"set name");
+
+ if (!ob_basename(name,sv)) log_dieu(LOG_EXIT_SYS,"set name");
+
size_t svlen = strlen(sv) ;
size_t namelen = strlen(name) ;
+
char tmp[svlen + 1 + namelen + 1] ;
r = scan_mode(sv,S_IFDIR) ;
if (r > 0)
@@ -125,33 +134,43 @@ int main(int argc, char const *const *argv,char const *const *envp)
tmp[svlen + 1 + namelen] = 0 ;
sv = tmp ;
}
- if (!dirname(srcdir,sv)) log_dieu(LOG_EXIT_SYS,"set directory name") ;
+
+ if (!ob_dirname(srcdir,sv)) log_dieu(LOG_EXIT_SYS,"set directory name") ;
+
check_dir(dir,force,0) ;
- if (!stralloc_cats(&insta,name) ||
- !stralloc_0(&insta)) log_die_nomem("stralloc") ;
+
+ if (!auto_stra(&insta,name)) log_die_nomem("stralloc") ;
+
ista = instance_check(insta.s) ;
if (!ista) log_die(LOG_EXIT_SYS,"invalid instance name: ",insta.s) ;
if (ista > 0)
{
- if (!instance_create(&src,insta.s,SS_INSTANCE,srcdir,ista))
+ if (!instance_splitname(&insta,name,ista,SS_INSTANCE_TEMPLATE)) log_dieu(LOG_EXIT_SYS,"split instance name of: ",name) ;
+ }
+
+ if (!read_svfile(&src,insta.s,srcdir)) log_dieusys(LOG_EXIT_SYS,"open: ",sv) ;
+
+ if (!get_svtype(&service,src.s)) log_dieu(LOG_EXIT_SYS,"get service type of: ",sv) ;
+
+ if (ista > 0)
+ {
+ if (!instance_create(&src,name,SS_INSTANCE,ista))
log_dieu(LOG_EXIT_SYS,"create instance service: ",name) ;
memcpy(name,insta.s,insta.len) ;
name[insta.len] = 0 ;
}
- else if (!read_svfile(&src,name,srcdir)) log_dieusys(LOG_EXIT_SYS,"open: ",sv) ;
-
- log_info("Parsing service file: ", sv) ;
- if (!parser(&service,&src,sv)) log_dieu(LOG_EXIT_SYS,"parse service file: ",sv) ;
- if (!stralloc_cats(&dst,dir) ||
- !stralloc_cats(&dst,"/") ||
- !stralloc_cats(&dst,name) ||
- !stralloc_0(&dst)) log_die_nomem("stralloc") ;
+
+ if (!parser(&service,&src,sv,service.cname.itype)) log_dieu(LOG_EXIT_SYS,"parse service file: ",sv) ;
+
+ if (!auto_stra(&dst,dir,"/",name)) log_die_nomem("stralloc") ;
+
check_dir(dst.s,force,1) ;
- log_info("Write service file: ", name," at: ",dst.s) ;
+
type = service.cname.itype ;
srcdirlen = strlen(srcdir) ;
service.src = keep.len ;
+
if (!stralloc_catb(&keep,srcdir,srcdirlen + 1)) log_die_nomem("stralloc") ;
/**quick fix
* WIP on parser this will change soon*/
@@ -161,7 +180,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
stralloc saname = STRALLOC_ZERO ;
if (!stralloc_cats(&saname,keep.s + service.cname.name)) log_die_nomem("stralloc") ;
- if (!instance_splitname(&sainsta,name,ista,0)) log_dieu(LOG_EXIT_SYS,"split instance name: ",name) ;
+ if (!instance_splitname(&sainsta,name,ista,SS_INSTANCE_TEMPLATE)) log_dieu(LOG_EXIT_SYS,"split instance name: ",name) ;
if (sastr_find(&saname,sainsta.s) == -1)
log_die(LOG_EXIT_USER,"invalid instantiated service name: ", keep.s + service.cname.name) ;
@@ -173,9 +192,11 @@ int main(int argc, char const *const *argv,char const *const *envp)
service.cname.name = keep.len ;
if (!stralloc_catb(&keep,name,namelen + 1)) log_die_nomem("stralloc") ;
}
+
/* save and prepare environment file */
if (service.opts[2])
{
+
stralloc conf = STRALLOC_ZERO ;
if (!stralloc_catb(&conf,dst.s,dst.len-1) ||
!stralloc_cats(&conf,"/env/") ||
@@ -188,31 +209,37 @@ int main(int argc, char const *const *argv,char const *const *envp)
if (!stralloc_catb(&keep,conf.s,conf.len + 1)) log_die_nomem("stralloc") ;
stralloc_free(&conf) ;
}
+
switch(type)
{
- case CLASSIC:
+ case TYPE_CLASSIC:
if (!write_classic(&service, dst.s, force, conf))
log_dieu(LOG_EXIT_SYS,"write: ",name) ;
break ;
- case LONGRUN:
+ case TYPE_LONGRUN:
if (!write_longrun(&service, dst.s, force, conf))
log_dieu(LOG_EXIT_SYS,"write: ",name) ;
break ;
- case ONESHOT:
+ case TYPE_ONESHOT:
if (!write_oneshot(&service, dst.s, conf))
log_dieu(LOG_EXIT_SYS,"write: ",name) ;
break ;
- case BUNDLE:
+ case TYPE_MODULE:
+ case TYPE_BUNDLE:
if (!write_bundle(&service, dst.s))
log_dieu(LOG_EXIT_SYS,"write: ",name) ;
break ;
default: break ;
- }
+ }
+
+ log_info("Written successfully: ",name, " at: ",dir) ;
+
sv_alltype_free(&service) ;
stralloc_free(&keep) ;
stralloc_free(&deps) ;
stralloc_free(&src) ;
stralloc_free(&dst) ;
+
return 0 ;
}
diff --git a/src/66/66-scanctl.c b/src/66/66-scanctl.c
index 4b1e5f9a6cfce500c0e0a9be0298102160091b38..7c47c99928c0be77603bb3bb88c11d695cbd85be 100644
--- a/src/66/66-scanctl.c
+++ b/src/66/66-scanctl.c
@@ -24,7 +24,7 @@
#define SIGSIZE 64
-#define USAGE "66-scanctl [ -h ] [ -v verbosity ] [ -l live ] [ -o owner ] signal"
+#define USAGE "66-scanctl [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -o owner ] signal"
static inline void info_help (void)
{
@@ -33,6 +33,7 @@ static inline void info_help (void)
"\n"
"options :\n"
" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -o: handle scandir of owner\n"
@@ -111,14 +112,16 @@ int main(int argc, char const *const *argv)
uid_t owner = MYUID ;
char const *signal ;
stralloc scandir = STRALLOC_ZERO ;
-
+
+ log_color = &log_color_disable ;
+
PROG = "66-scanctl" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:l:o:", &l) ;
+ int opt = getopt_args(argc,argv, ">hv:l:o:z", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
@@ -132,6 +135,7 @@ int main(int argc, char const *const *argv)
if (MYUID) log_die(LOG_EXIT_USER, "only root can use -o options") ;
else if (!youruid(&owner,l.arg)) log_dieusys(LOG_EXIT_SYS,"get uid of: ",l.arg) ;
break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
default : log_usage(USAGE) ;
}
}
diff --git a/src/66/66-scandir.c b/src/66/66-scandir.c
index dba3e3f40a13a2bdffdf33bd5044d7f8da64522d..2e563b21926307f485d9fa8c97a2bd9a1da0e326 100644
--- a/src/66/66-scandir.c
+++ b/src/66/66-scandir.c
@@ -68,7 +68,7 @@ static char const *log_user = SS_LOGGER_RUNNER ;
static unsigned int BOOT = 0 ;
unsigned int NOTIF = 0 ;
-#define USAGE "66-scandir [ -h ] [ -v verbosity ] [ -b ] [ -l live ] [ -d notif ] [ -t rescan ] [ -L log_user ] [ -s skel ] [ -e environment ] [ -c | u | r ] owner"
+#define USAGE "66-scandir [ -h ] [ -z ] [ -v verbosity ] [ -b ] [ -l live ] [ -d notif ] [ -t rescan ] [ -L log_user ] [ -s skel ] [ -e environment ] [ -c | u | r ] owner"
static inline void info_help (void)
{
@@ -76,7 +76,8 @@ static inline void info_help (void)
"66-scandir <options> owner\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -b: create scandir for a boot process\n"
" -l: live directory\n"
@@ -483,6 +484,8 @@ int main(int argc, char const *const *argv, char const *const *envp)
char const *newenv[MAXENV+1] ;
char const *const *genv = 0 ;
+ log_color = &log_color_disable ;
+
up = rescan = create = remove = 0 ;
PROG = "66-scandir" ;
@@ -491,12 +494,13 @@ int main(int argc, char const *const *argv, char const *const *envp)
for (;;)
{
- int opt = getopt_args(argc,argv, ">hv:bl:d:t:s:e:cruL:", &l) ;
+ int opt = getopt_args(argc,argv, ">hzv:bl:d:t:s:e:cruL:", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
{
case 'h' : info_help(); return 0 ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) log_usage(USAGE) ; break ;
case 'b' : BOOT = 1 ; break ;
case 'l' : if(!stralloc_cats(&live,l.arg)) log_die_nomem("stralloc") ;
diff --git a/src/66/66-tree.c b/src/66/66-tree.c
index f5027f7cac34b515629e4bbcce5d3f6c97d25def..13e94630e1e92c76ae81fc3e315a6e52e4849c08 100644
--- a/src/66/66-tree.c
+++ b/src/66/66-tree.c
@@ -43,7 +43,7 @@
#include <s6-rc/s6rc-servicedir.h>
#include <s6-rc/s6rc-constants.h>
-#define USAGE "66-tree [ -h ] [ -v verbosity ] [ -l ] [ -n|R ] [ -a|d ] [ -c ] [ -S after_tree ] [ -E|D ] [ -U ] [ -C clone ] tree"
+#define USAGE "66-tree [ -h ] [ -z ] [ -v verbosity ] [ -l ] [ -n|R ] [ -a|d ] [ -c ] [ -S after_tree ] [ -E|D ] [ -U ] [ -C clone ] tree"
static stralloc reslive = STRALLOC_ZERO ;
static char const *cleantree = 0 ;
@@ -55,6 +55,7 @@ static inline void info_help (void)
"\n"
"options :\n"
" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -n: create a new empty tree\n"
@@ -150,6 +151,8 @@ int sanitize_tree(stralloc *dstree, char const *base, char const *tree,uid_t own
auto_check_one(SS_SERVICE_SYSDIR,0755) ;
auto_check_one(SS_SERVICE_ADMDIR,0755) ;
auto_check_one(SS_SERVICE_ADMCONFDIR,0755) ;
+ auto_check_one(SS_MODULE_SYSDIR,0755) ;
+ auto_check_one(SS_MODULE_ADMDIR,0755) ;
}
else
{
@@ -170,6 +173,8 @@ int sanitize_tree(stralloc *dstree, char const *base, char const *tree,uid_t own
auto_check_one(extra.s,0755) ;
extra.len = extralen ;
auto_stralloc_0(&extra,SS_SERVICE_USERCONFDIR) ;
+ extra.len = extralen ;
+ auto_stralloc_0(&extra,SS_MODULE_USERDIR) ;
auto_check_one(extra.s,0755) ;
stralloc_free(&extra) ;
}
@@ -214,7 +219,7 @@ void create_tree(char const *tree,char const *treename)
res.description = ss_resolve_add_string(&res,"inner bundle - do not use it") ;
res.tree = ss_resolve_add_string(&res,dst) ;
res.treename = ss_resolve_add_string(&res,treename) ;
- res.type = BUNDLE ;
+ res.type = TYPE_BUNDLE ;
res.disen = 1 ;
auto_create(dst,SS_SVDIRS,newlen,0755) ;
@@ -492,6 +497,8 @@ int main(int argc, char const *const *argv,char const *const *envp)
stralloc clone = STRALLOC_ZERO ;
stralloc live = STRALLOC_ZERO ;
+ log_color = &log_color_disable ;
+
current = create = allow = deny = enable = disable = remove = snap = unsupervise = 0 ;
PROG = "66-tree" ;
@@ -501,7 +508,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
for (;;)
{
- int opt = getopt_args(argc,argv, "hv:l:na:d:cS:EDRC:U", &l) ;
+ int opt = getopt_args(argc,argv, "hv:l:na:d:cS:EDRC:Uz", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
@@ -530,6 +537,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
snap = 1 ;
break ;
case 'U' : unsupervise = 1 ; if (create)log_usage(USAGE) ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
default : log_usage(USAGE) ;
}
}
diff --git a/src/66/66-update.c b/src/66/66-update.c
index cb7718b1eef10d7e73ea1f1779451a861bc7b941..9057d2d6058e34e68de8651417f261549bab2969 100644
--- a/src/66/66-update.c
+++ b/src/66/66-update.c
@@ -38,7 +38,7 @@
#include <66/resolve.h>
#include <66/parser.h>
-#define USAGE "66-update [ -h ] [ -c ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)"
+#define USAGE "66-update [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)"
static stralloc WORKDIR = STRALLOC_ZERO ;
static uint8_t DRYRUN = 0 ;
@@ -50,7 +50,7 @@ static inline void info_help (void)
"\n"
"options :\n"
" -h: print this help\n"
-" -c: use color\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -d: dry run\n"
@@ -81,7 +81,7 @@ int tree_is_current(char const *base,char const *treename,uid_t owner)
if (tree_find_current(&sacurr,base,owner))
{
char name[sacurr.len + 1] ;
- if (!basename(name,sacurr.s)) log_dieu_nclean(LOG_EXIT_SYS,&cleanup,"basename of: ",sacurr.s) ;
+ if (!ob_basename(name,sacurr.s)) log_dieu_nclean(LOG_EXIT_SYS,&cleanup,"basename of: ",sacurr.s) ;
current = obstr_equal(treename,name) ;
}
stralloc_free(&sacurr) ;
@@ -142,7 +142,7 @@ void tree_contents(stralloc *list,char const *tree,ssexec_t *info)
int logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
if (logname > 0) continue ;
log_trace(DRYRUN ? drun : "","tree: ",info->treename.s," contain service: ",name) ;
- if (ss_resolve_src_path(list,name,info) < 1)
+ if (ss_resolve_src_path(list,name,info->owner) < 1)
log_dieu_nclean(LOG_EXIT_SYS,&cleanup,"resolve source path of: ",name) ;
}
@@ -182,20 +182,20 @@ int main(int argc, char const *const *argv,char const *const *envp)
size_t systemlen, optslen = 5, pos, len ;
char tree_opts_create[optslen] ;
char *fdir = 0 ;
-
+
log_color = &log_color_disable ;
-
+
stralloc satree = STRALLOC_ZERO ;
stralloc allow = STRALLOC_ZERO ;
stralloc contents = STRALLOC_ZERO ;
ssexec_t info = SSEXEC_ZERO ;
-
+
PROG = "66-update" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = subgetopt_r(argc,argv, "hv:l:cd", &l) ;
+ int opt = subgetopt_r(argc,argv, "hzv:l:dc", &l) ;
if (opt == -1) break ;
switch (opt)
@@ -205,8 +205,9 @@ int main(int argc, char const *const *argv,char const *const *envp)
case 'l' : if (!stralloc_cats(&info.live,l.arg)) log_die_nomem("stralloc") ;
if (!stralloc_0(&info.live)) log_die_nomem("stralloc") ;
break ;
- case 'c' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'd' : DRYRUN = 1 ; break ;
+ case 'c' : log_die(LOG_EXIT_SYS,"deprecated option -- please use -z instead") ;
default : log_usage(USAGE) ;
}
}
@@ -382,8 +383,9 @@ int main(int argc, char const *const *argv,char const *const *envp)
auto_string_from(tmp,0,WORKDIR.s) ;
}
- start_parser(&contents,&info,&nbsv,DRYRUN ? 1 : 0) ;
- start_write(&tostart,&nclassic,&nlongrun,tmp,&gasv,&info,DRYRUN ? 1 : 0,0) ;
+
+ start_parser(&contents,&info,&nbsv,1) ;
+ start_write(&tostart,&nclassic,&nlongrun,tmp,&gasv,&info,1,0) ;
/** we don't care about nclassic. Classic service are copies
* of original and we retrieve the original at the end of the
* process*/
diff --git a/src/extra-tools/66-umountall.c b/src/extra-tools/66-umountall.c
index 3ab7c92e07956c93ec7464a51179b01070034d28..0336d358a4ee4285f9a14028d3462255c2994ae7 100644
--- a/src/extra-tools/66-umountall.c
+++ b/src/extra-tools/66-umountall.c
@@ -40,7 +40,7 @@ int main (int argc, char const *const *argv)
{
size_t mountpoints[MAXLINES], tmplen = strlen(SS_LIVE), len = 0 ;
char tmpdir[tmplen + 1] ;
- dirname(tmpdir,SS_LIVE) ;
+ ob_dirname(tmpdir,SS_LIVE) ;
len = strlen(tmpdir) ;
if (tmpdir[len-1] == '/')
tmpdir[len-1] = 0 ;
diff --git a/src/include/66/constants.h b/src/include/66/constants.h
index 40886ec92955f50d4399b7ad7d0151dad47b1bfe..b732e87d817092921a09b64d695064b45ea7ee96 100644
--- a/src/include/66/constants.h
+++ b/src/include/66/constants.h
@@ -25,6 +25,8 @@
#define SS_TREE_CURRENT_LEN (sizeof SS_TREE_CURRENT - 1)
#define SS_SERVICE "service"
#define SS_SERVICE_LEN (sizeof SS_SERVICE - 1)
+#define SS_MODULE "module"
+#define SS_MODULE_LEN (sizeof SS_MODULE - 1)
#define SS_SCANDIR "scandir"
#define SS_SCANDIR_LEN (sizeof SS_SCANDIR - 1)
#define SS_TREE "tree"
@@ -113,4 +115,6 @@
/** Instance */
#define SS_INSTANCE "@I"
+#define SS_INSTANCE_TEMPLATE 0
+#define SS_INSTANCE_NAME 1
#endif
diff --git a/src/include/66/enum.h b/src/include/66/enum.h
index 0416cdd96f1297e13a70477e22436689d40c7415..ba10f7353ebf8e8a9e8dfaddbd1df45deadc0e64 100644
--- a/src/include/66/enum.h
+++ b/src/include/66/enum.h
@@ -15,99 +15,270 @@
#ifndef SS_ENUM_H
#define SS_ENUM_H
-
#include <sys/types.h>
+#define ENUM_START 0
+
+typedef enum enum_main_e enum_main_t, *enum_main_t_ref ;
+enum enum_main_e
+{
+ ENUM_SECTION = 0 ,
+ ENUM_KEY_SECTION_MAIN ,
+ ENUM_KEY_SECTION_STARTSTOP ,
+ ENUM_KEY_SECTION_LOGGER ,
+ ENUM_KEY_SECTION_ENVIRON ,
+ ENUM_KEY_SECTION_REGEX ,
+ ENUM_TYPE ,
+ ENUM_EXPECTED ,
+ ENUM_OPTS ,
+ ENUM_FLAGS ,
+ ENUM_BUILD ,
+ ENUM_MANDATORY ,
+ ENUM_TIME ,
+ ENUM_LOGOPTS ,
+ ENUM_ENDOFKEY
+} ;
+
+typedef enum enum_section_e enum_section_t, *enum_section_t_ref ;
+enum enum_section_e
+{
+ SECTION_MAIN = 0 ,
+ SECTION_START ,
+ SECTION_STOP ,
+ SECTION_LOG ,
+ SECTION_ENV ,
+ SECTION_REGEX ,
+ SECTION_ENDOFKEY
+} ;
+
+extern char const *enum_str_section[] ;
+
+typedef enum enum_key_section_main_e enum_key_section_main_t, *enum_key_section_main_t_ref ;
+enum enum_key_section_main_e
+{
+ KEY_MAIN_TYPE = 0 ,
+ KEY_MAIN_NAME ,
+ KEY_MAIN_VERSION ,
+ KEY_MAIN_DESCRIPTION ,
+ KEY_MAIN_CONTENTS ,
+ KEY_MAIN_DEPENDS ,
+ KEY_MAIN_OPTSDEPS ,
+ KEY_MAIN_EXTDEPS ,
+ KEY_MAIN_OPTIONS ,
+ KEY_MAIN_NOTIFY ,
+ KEY_MAIN_USER ,
+ KEY_MAIN_T_FINISH ,
+ KEY_MAIN_T_KILL ,
+ KEY_MAIN_T_UP ,
+ KEY_MAIN_T_DOWN ,
+ KEY_MAIN_DEATH ,
+ KEY_MAIN_HIERCOPY ,
+ KEY_MAIN_SIGNAL ,
+ KEY_MAIN_FLAGS ,
+ KEY_MAIN_ENDOFKEY
+} ;
-typedef enum key_enum_e key_enum_t, *key_enum_t_ref ;
-enum key_enum_e
-{
- //Section
- MAIN = 0 ,
- START ,
- STOP ,
- LOG ,
- ENV ,
- //Main
- TYPE ,// = 5
- NAME ,
- DESCRIPTION ,
- CONTENTS ,
- DEPENDS ,
- OPTSDEPS ,
- EXTDEPS ,
- OPTIONS ,
- NOTIFY ,
- USER ,
- PRODUCER ,
- CONSUMER ,
- BUILD ,
- SIGNAL ,
- FLAGS ,
- RUNAS ,
- SHEBANG ,
- T_KILL ,
- T_FINISH ,
- T_UP ,
- T_DOWN ,
- DEATH ,
- HIERCOPY ,
- EXEC ,
- DESTINATION ,
- BACKUP ,
- MAXSIZE ,
- TIMESTP ,
- ENVAL ,
- //Service type
- CLASSIC, // = 34
- BUNDLE ,
- LONGRUN ,
- ONESHOT ,
- //Key expected
- LINE , // = 38
- BRACKET ,
- UINT ,
- SLASH ,
- QUOTE ,
- KEYVAL ,
- //Options
- LOGGER , // = 44
- PIPELINE ,
- //Flags
- DOWN , // = 46
- NOSETSID ,
- ENVIR ,
- //Build
- AUTO , // = 49
- CUSTOM ,
- //Mandatory
- NEED , // = 51
- OPTS ,
- //Time
- TAI , // = 53
- ISO ,
- NONE ,
- ENDOFKEY
-} ;
-#define PIPELINE_NAME "pipeline-name"
-
-extern int const key_enum_el ;
-extern int const key_enum_section_el ;
-
-extern int const key_enum_main_el ;
-extern int const key_enum_svtype_el ;
-extern int const key_enum_expect_el ;
-extern int const key_enum_options_el ;
-extern int const key_enum_flags_el ;
-extern int const key_enum_build_el ;
-extern int const key_enum_mandatory_el ;
-extern int const key_enum_time_el ;
+extern char const *enum_str_key_section_main[] ;
+
+typedef enum enum_key_section_startstop_e enum_key_section_startstop_t, *enum_key_section_startstop_t_ref ;
+enum enum_key_section_startstop_e
+{
+ KEY_STARTSTOP_BUILD = 0 ,
+ KEY_STARTSTOP_RUNAS ,
+ KEY_STARTSTOP_SHEBANG ,
+ KEY_STARTSTOP_EXEC ,
+ KEY_STARTSTOP_ENDOFKEY
+} ;
+
+extern char const *enum_str_key_section_startstop[] ;
+
+typedef enum enum_key_section_logger_e enum_key_section_logger_t, *enum_key_section_logger_t_ref ;
+enum enum_key_section_logger_e
+{
+ KEY_LOGGER_BUILD = 0 ,
+ KEY_LOGGER_RUNAS ,
+ KEY_LOGGER_SHEBANG ,
+ KEY_LOGGER_EXEC ,
+ KEY_LOGGER_DESTINATION ,
+ KEY_LOGGER_BACKUP ,
+ KEY_LOGGER_MAXSIZE ,
+ KEY_LOGGER_TIMESTP ,
+ KEY_LOGGER_T_FINISH ,
+ KEY_LOGGER_T_KILL ,
+ KEY_LOGGER_DEPENDS ,
+ KEY_LOGGER_ENDOFKEY
+} ;
+
+extern char const *enum_str_key_section_logger[] ;
+
+typedef enum enum_key_section_environ_e enum_key_section_environ_t, *enum_key_section_environ_e_ref ;
+enum enum_key_section_environ_e
+{
+ KEY_ENVIRON_ENVAL = 0 ,
+ KEY_ENVIRON_ENDOFKEY
+} ;
+
+extern char const *enum_str_key_section_environ[] ;
+
+typedef enum enum_key_section_regex_e enum_key_section_regex_t, *enum_key_section_regex_t_ref ;
+enum enum_key_section_regex_e
+{
+ KEY_REGEX_CONFIGURE = 0 ,
+ KEY_REGEX_DIRECTORIES ,
+ KEY_REGEX_FILES ,
+ KEY_REGEX_INFILES ,
+ KEY_REGEX_ENDOFKEY
+} ;
+
+extern char const *enum_str_key_section_regex[] ;
+
+/* prepare for the near future
+typedef enum enum_key_section_cgroups_e enum_key_section_cgroups_t, *enum_key_section_cgroups_t_ref ;
+enum enum_key_section_cgroups_e
+{
+
+} ;
+
+extern char const *enum_str_key_section_cgroups[] ;
+
+typedef enum enum_key_section_namespaces_e enum_key_section_namespaces_t, *enum_key_section_namespaces_t_ref ;
+enum enum_key_section_namespaces_e
+{
+
+} ;
+
+extern char const enum_str_key_section_namespaces[] ;
+*/
+
+typedef enum enum_type_e enum_type_t, *enum_type_t_ref ;
+enum enum_type_e
+{
+ TYPE_CLASSIC = 0 ,
+ TYPE_BUNDLE ,
+ TYPE_LONGRUN ,
+ TYPE_ONESHOT ,
+ TYPE_MODULE ,
+ TYPE_ENDOFKEY
+
+} ;
+
+extern char const *enum_str_type[] ;
+
+typedef enum enum_expected_e enum_expected_t, *enum_expected_t_ref ;
+enum enum_expected_e
+{
+ EXPECT_LINE = 0 ,
+ EXPECT_BRACKET ,
+ EXPECT_UINT ,
+ EXPECT_SLASH ,
+ EXPECT_QUOTE ,
+ EXPECT_KEYVAL ,
+ EXPECT_ENDOFKEY
+} ;
+
+extern char const *enum_str_expected[] ;
+
+typedef enum enum_opts_e enum_opts_t, *enum_opts_t_ref ;
+enum enum_opts_e
+{
+ OPTS_LOGGER = 0 ,
+ OPTS_ENVIR ,
+ OPTS_HIERCOPY ,
+ OPTS_PIPELINE ,
+ OPTS_ENDOFKEY
+} ;
+
+extern char const *enum_str_opts[] ;
+
+typedef enum enum_flags_e enum_flags_t, *enum_flags_t_ref ;
+enum enum_flags_e
+{
+ FLAGS_DOWN = 0 ,
+ FLAGS_NOSETSID ,
+ FLAGS_ENDOFKEY
+} ;
+
+extern char const *enum_str_flags[] ;
+
+typedef enum enum_build_e enum_build_t, *enum_build_t_ref ;
+enum enum_build_e
+{
+ BUILD_AUTO = 0 ,
+ BUILD_CUSTOM ,
+ BUILD_ENDOFKEY
+} ;
+
+extern char const *enum_str_build[] ;
+
+typedef enum enum_mandatory_e enum_mandatory_t, *enum_mandatory_t_ref ;
+enum enum_mandatory_e
+{
+ MANDATORY_NEED = 0 ,
+ MANDATORY_OPTS ,
+ MANDATORY_BUNDLE ,
+ MANDATORY_CUSTOM ,
+ MANDATORY_ENDOFKEY
+} ;
+
+extern char const *enum_str_mandatory[] ;
+
+typedef enum enum_time_e enum_time_t, *enum_time_t_ref ;
+enum enum_time_e
+{
+ TIME_TAI = 0 ,
+ TIME_ISO ,
+ TIME_NONE ,
+ TIME_ENDOFKEY
+} ;
+
+extern char const *enum_str_time[] ;
+
+typedef enum enum_logopts_e enum_logotps_t, *enum_logopts_t_ref ;
+enum enum_logopts_e
+{
+ LOGOPTS_PRODUCER = 0 ,
+ LOGOPTS_CONSUMER ,
+ LOGOPTS_PIPE ,
+ LOGOPTS_ENDOFKEY
+} ;
+
+extern char const *enum_str_logopts[] ;
+
+
+typedef struct enum_all_enum_s enum_all_enum_t, *enum_all_enum_t_ref ;
+struct enum_all_enum_s
+{
+ unsigned int const enum_all ;
+ char const **str ;
+} ;
+
+extern ssize_t get_enum_by_key_one(char const *str, int const e) ;
+extern ssize_t get_enum_by_key(char const *str) ;
+extern char const *get_key_by_enum(int const e, int const key) ;
+extern enum_all_enum_t enum_all[] ;
+
+typedef enum actions_e actions_t, *actions_t_ref ;
+enum actions_e
+{
+ ACTION_COMMON = 0 ,
+ ACTION_EXECRUN ,
+ ACTION_EXECFINISH ,
+ ACTION_EXECLOG ,
+ ACTION_EXECUP ,
+ ACTION_EXECDOWN,
+ ACTION_ENVIRON,
+ ACTION_REGEX ,
+ ACTION_SKIP
+} ;
+
+extern unsigned char const actions[SECTION_ENDOFKEY][TYPE_ENDOFKEY] ;
+extern unsigned char const states[SECTION_ENDOFKEY][TYPE_ENDOFKEY] ;
typedef struct key_description_s key_description_t ;
struct key_description_s
{
- char const *name ;
- key_enum_t const expected ;
- key_enum_t const mandatory ;
+ char const **name ;
+ int const id ;
+ int const expected ;
} ;
typedef struct key_all_s key_all_t ;
@@ -118,59 +289,76 @@ struct key_all_s
static key_description_t const main_section_list[] =
{
- { .name = "@type", .expected = LINE, .mandatory = NEED },
- { .name = "@name", .expected = LINE, .mandatory = OPTS },
- { .name = "@description", .expected = QUOTE, .mandatory = OPTS },
- { .name = "@depends", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@optsdepends", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@extdepends", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@contents", .expected = BRACKET, .mandatory = BUNDLE },
- { .name = "@options", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@flags", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@notify", .expected = UINT, .mandatory = OPTS },
- { .name = "@user", .expected = BRACKET, .mandatory = NEED },
- { .name = "@timeout-finish", .expected = UINT, .mandatory = OPTS },
- { .name = "@timeout-kill", .expected = UINT, .mandatory = OPTS },
- { .name = "@timeout-up", .expected = UINT, .mandatory = OPTS },
- { .name = "@timeout-down", .expected = UINT, .mandatory = OPTS },
- { .name = "@maxdeath", .expected = UINT, .mandatory = OPTS },
- { .name = "@down-signal", .expected = UINT, .mandatory = OPTS },
- { .name = "@hiercopy", .expected = BRACKET, .mandatory = OPTS },
- { .name = 0 }
+ { .name = &enum_str_key_section_main[KEY_MAIN_TYPE], .id = KEY_MAIN_TYPE, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_main[KEY_MAIN_NAME], .id = KEY_MAIN_NAME, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_main[KEY_MAIN_VERSION], .id = KEY_MAIN_VERSION, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_main[KEY_MAIN_DESCRIPTION], .id = KEY_MAIN_DESCRIPTION, .expected = EXPECT_QUOTE },
+ { .name = &enum_str_key_section_main[KEY_MAIN_DEPENDS], .id = KEY_MAIN_DEPENDS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_OPTSDEPS], .id = KEY_MAIN_OPTSDEPS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_EXTDEPS], .id = KEY_MAIN_EXTDEPS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_CONTENTS], .id = KEY_MAIN_CONTENTS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_OPTIONS], .id = KEY_MAIN_OPTIONS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_FLAGS], .id = KEY_MAIN_FLAGS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_NOTIFY], .id = KEY_MAIN_NOTIFY, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_USER], .id = KEY_MAIN_USER, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_T_FINISH], .id = KEY_MAIN_T_FINISH, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_T_KILL], .id = KEY_MAIN_T_KILL, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_T_UP], .id = KEY_MAIN_T_UP, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_T_DOWN], .id = KEY_MAIN_T_DOWN, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_DEATH], .id = KEY_MAIN_DEATH, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_SIGNAL], .id = KEY_MAIN_SIGNAL, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_main[KEY_MAIN_HIERCOPY], .id = KEY_MAIN_HIERCOPY, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_main[KEY_MAIN_ENDOFKEY] }
} ;
static key_description_t const startstop_section_list[] =
{
- { .name = "@build", .expected = LINE, .mandatory = NEED },
- { .name = "@runas", .expected = LINE, .mandatory = OPTS },
- { .name = "@shebang", .expected = QUOTE, .mandatory = CUSTOM },
- { .name = "@execute", .expected = BRACKET, .mandatory = NEED },
- { .name = 0 }
+ { .name = &enum_str_key_section_startstop[KEY_STARTSTOP_BUILD], .id = KEY_STARTSTOP_BUILD, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_startstop[KEY_STARTSTOP_RUNAS], .id = KEY_STARTSTOP_RUNAS, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_startstop[KEY_STARTSTOP_SHEBANG], .id = KEY_STARTSTOP_SHEBANG, .expected = EXPECT_QUOTE },
+ { .name = &enum_str_key_section_startstop[KEY_STARTSTOP_EXEC], .id = KEY_STARTSTOP_EXEC, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_startstop[KEY_STARTSTOP_ENDOFKEY] }
} ;
static key_description_t const logger_section_list[] =
{
- { .name = "@destination", .expected = SLASH, .mandatory = CUSTOM },
- { .name = "@build", .expected = LINE, .mandatory = NEED },
- { .name = "@runas", .expected = LINE, .mandatory = OPTS },
- { .name = "@depends", .expected = BRACKET, .mandatory = OPTS },
- { .name = "@shebang", .expected = QUOTE, .mandatory = CUSTOM },
- { .name = "@timeout-finish", .expected = UINT, .mandatory = OPTS },
- { .name = "@timeout-kill", .expected = UINT, .mandatory = OPTS },
- { .name = "@backup", .expected = UINT, .mandatory = OPTS },
- { .name = "@maxsize", .expected = UINT, .mandatory = OPTS },
- { .name = "@timestamp", .expected = LINE, .mandatory = OPTS },
- { .name = "@execute", .expected = BRACKET, .mandatory = CUSTOM },
- { .name = 0 }
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_DESTINATION], .id = KEY_LOGGER_DESTINATION, .expected = EXPECT_SLASH },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_BUILD], .id = KEY_LOGGER_BUILD, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_RUNAS], .id = KEY_LOGGER_RUNAS, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_DEPENDS], .id = KEY_LOGGER_DEPENDS, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_SHEBANG], .id = KEY_LOGGER_SHEBANG, .expected = EXPECT_QUOTE },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_T_FINISH], .id = KEY_LOGGER_T_FINISH, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_T_KILL], .id = KEY_LOGGER_T_KILL, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_BACKUP], .id = KEY_LOGGER_BACKUP, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_MAXSIZE], .id = KEY_LOGGER_MAXSIZE, .expected = EXPECT_UINT },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_TIMESTP], .id = KEY_LOGGER_TIMESTP, .expected = EXPECT_LINE },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_EXEC], .id = KEY_LOGGER_EXEC, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_logger[KEY_LOGGER_ENDOFKEY] }
} ;
static key_description_t const environment_section_list[] =
{
- { .name = "environment", .expected = KEYVAL, .mandatory = OPTS },
- { .name = 0 }
+ { .name = &enum_str_key_section_environ[KEY_ENVIRON_ENVAL], .id = KEY_ENVIRON_ENVAL, .expected = EXPECT_KEYVAL },
+ { .name = &enum_str_key_section_environ[KEY_ENVIRON_ENDOFKEY] }
} ;
-static int const total_list_el[6] = { 19, 5, 5, 12, 2, 0 } ;
+static key_description_t const regex_section_list[] =
+{
+ { .name = &enum_str_key_section_regex[KEY_REGEX_CONFIGURE], .id = KEY_REGEX_CONFIGURE, .expected = EXPECT_QUOTE },
+ { .name = &enum_str_key_section_regex[KEY_REGEX_DIRECTORIES], .id = KEY_REGEX_DIRECTORIES, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_regex[KEY_REGEX_FILES], .id = KEY_REGEX_FILES, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_regex[KEY_REGEX_INFILES], .id = KEY_REGEX_INFILES, .expected = EXPECT_BRACKET },
+ { .name = &enum_str_key_section_regex[KEY_REGEX_ENDOFKEY] }
+} ;
+
+static int const total_list_el[7] = { \
+ KEY_MAIN_ENDOFKEY + 1, \
+ KEY_STARTSTOP_ENDOFKEY + 1, \
+ KEY_STARTSTOP_ENDOFKEY + 1, \
+ KEY_LOGGER_ENDOFKEY + 1, \
+ KEY_ENVIRON_ENDOFKEY + 1, \
+ KEY_REGEX_ENDOFKEY + 1, \
+ 0 } ;
static key_all_t const total_list[] =
{
@@ -179,15 +367,9 @@ static key_all_t const total_list[] =
{ .list = startstop_section_list },
{ .list = logger_section_list },
{ .list = environment_section_list },
+ { .list = regex_section_list },
{ .list = 0 }
} ;
-/** Compare @str with function @func on @key_el enum table
- * @Return the index of the table
- * @Return -1 on fail*/
-extern ssize_t get_enumbyid(char const *str,key_enum_t key_el) ;
-
-/**@Return the string of the @key */
-extern char const *get_keybyid(key_enum_t key) ;
#endif
diff --git a/src/include/66/info.h b/src/include/66/info.h
index 87800788d5b3fffc8123a6339cebe774bfb3c317..d149a46355488121b6d6c8c18604a177944328ac 100644
--- a/src/include/66/info.h
+++ b/src/include/66/info.h
@@ -25,6 +25,7 @@
#define SS_INFO_H
#define INFO_FIELD_MAXLEN 30
+#define INFO_NKEY 100
typedef struct depth_s depth_t ;
struct depth_s
diff --git a/src/include/66/parser.h b/src/include/66/parser.h
index b4f430cdfb7e7378c6c3c5ac9f654e546fc498cf..73519ebd930da37639ec67c73699773bb4899a37 100644
--- a/src/include/66/parser.h
+++ b/src/include/66/parser.h
@@ -33,31 +33,16 @@
extern stralloc keep ;
extern stralloc deps ;
-//extern genalloc gadeps ;
extern genalloc gasv ;
-typedef enum actions_e actions_t, *actions_t_ref ;
-enum actions_e
-{
- COMMON = 0 ,
- EXECRUN ,
- EXECFINISH ,
- EXECLOG ,
- EXECUP ,
- EXECDOWN,
- ENVIRON,
- SKIP
-} ;
-
/**struct for run and finish file*/
typedef struct sv_exec_s sv_exec,*sv_exec_ref ;
struct sv_exec_s
{
- /**build=45->auto,build=46->custom*/
int build ;
- unsigned int runas ;
- unsigned int shebang ;
- unsigned int exec ;
+ int runas ;
+ int shebang ;
+ int exec ;
} ;
typedef struct sv_execlog_s sv_execlog,*sv_execlog_ref ;
@@ -67,13 +52,13 @@ struct sv_execlog_s
/**timeout[0]->kill,timeout[1]->finish
* kill[0][X] enabled,kill[0][0] not enabled*/
uint32_t timeout[2][UINT_FMT] ;
- unsigned int destination ;
+ int destination ;
uint32_t backup ;
uint32_t maxsize ;
/**timestamp=50->tai,timestamp=51->iso,52->none*/
int timestamp ;
- unsigned int idga ; //pos in genalloc gadeps
- unsigned int nga ; //len of idga in genalloc gadeps
+ int idga ; //pos in stralloc deps
+ unsigned int nga ; //number of deps in stralloc deps
} ;
typedef struct sv_classic_longrun_s sv_classic_longrun,*sv_classic_ref ;
@@ -89,30 +74,47 @@ struct sv_oneshot_s
{
sv_exec up ;
sv_exec down ;
+ sv_execlog log ;
+} ;
+
+typedef struct sv_module_s sv_module,*sv_module_ref ;
+struct sv_module_s
+{
+ int configure ;
+ int iddir ; // pos in stralloc keep -> @directories
+ unsigned int ndir ; //number of regex directories in stralloc keep -> @directories
+ int idfiles ; // pos in stralloc keep -> @files
+ unsigned int nfiles ; //number of regex files in stralloc keep -> @files
+ int start_infiles ; // pos in stralloc keep of the start of the string -> @infiles
+ int end_infiles ; // pos in stralloc keep of the end of the string -> @infiles
} ;
-typedef union sv_type_u sv_type_t,*sv_type_t_ref ;
-union sv_type_u
+typedef struct sv_type_s sv_type_t,*sv_type_t_ref ;
+struct sv_type_s
{
sv_classic_longrun classic_longrun ;
sv_oneshot oneshot ;
+ sv_module module ;
} ;
typedef struct sv_name_s sv_name_t, *sv_name_t_ref ;
struct sv_name_s
{
- int itype ;/**int type =30->classic,31->bundle,32->longrun,33->oneshot*/
- int name ;//pos in keep
- unsigned int description ;//pos in keep
- unsigned int idga ; //pos in genalloc gadeps-> depends field
- unsigned int nga ; //number or deps in genalloc gadeps->depends field
- unsigned int idopts ;// pos in genalloc gadeps -> optional depends
- unsigned int nopts ; // number of optinal depends in genalloc gadeps->optional depends
- unsigned int idext ;// pos in genalloc gadeps -> external depends
- unsigned int next ; // number of optinal depends in genalloc gadeps->external depends
- unsigned int logname ; //pos in keep
- unsigned int dstlog ; //pos in keep
+ int itype ; //servcie type: classic->bundle->longrun->oneshot->modules
+ int name ; //pos in keep
+ int description ; //pos in keep
+ int version ; // pos in keep
+ int idga ; //pos in stralloc deps -> @depends or @contents
+ unsigned int nga ; //number or deps in stralloc deps -> @depends or @contents
+ int idopts ; // pos in stralloc deps -> @optsdepends
+ unsigned int nopts ; // number of optional depends in stralloc deps-> @optsdepends
+ int idext ; // pos in stralloc deps -> @extdepends
+ unsigned int next ; // number of optinal depends in stralloc deps -> @extdepends
+ int logname ; //pos in keep
+ int dstlog ; //pos in keep
} ;
+
+
typedef struct sv_alltype_s sv_alltype,*sv_alltype_ref ;
struct sv_alltype_s
{
@@ -124,7 +126,7 @@ struct sv_alltype_s
/**0->no notification*/
/**flags[0]->down,flags[1]->nosetsid,
* down[1] enabled,down[0] not enabled*/
- int flags[2] ;
+ unsigned int flags[2] ;
uint32_t notification ;
/** array of uid_t
* the first element of the table
@@ -143,7 +145,7 @@ struct sv_alltype_s
* dir/file to copy e.g hiercopy[0]=3->3 dir/file to copy */
uint32_t hiercopy[24] ; //dir/file to copy
int signal ;//down-signal file
- unsigned int pipeline ; //pos in deps
+ int pipeline ; //pos in deps
stralloc saenv ;
/* path of the environment file, this is only concern the write
* process, the read process could be different if conf/sysadmin/service
@@ -154,21 +156,21 @@ struct sv_alltype_s
#define SV_EXEC_ZERO \
{ \
- 0 ,\
- 0 ,\
- 0 ,\
- 0 \
+ -1 ,\
+ -1 ,\
+ -1 ,\
+ -1 \
}
#define SV_EXECLOG_ZERO \
{ \
SV_EXEC_ZERO,\
{ { 0 } } ,\
+ -1 ,\
0 ,\
0 ,\
- 0 ,\
- 0,\
- 0,\
+ -1 ,\
+ -1 ,\
0 \
}
@@ -182,27 +184,47 @@ struct sv_alltype_s
#define SV_ONESHOT_ZERO \
{ \
SV_EXEC_ZERO,\
- SV_EXEC_ZERO \
+ SV_EXEC_ZERO, \
+ SV_EXECLOG_ZERO \
}
-#define SV_NAME_ZERO \
+#define SV_TYPE_ZERO \
+{ \
+ SV_CLASSIC_LONGRUN_ZERO ,\
+ SV_ONESHOT_ZERO , \
+ SV_MODULE_ZERO \
+}
+
+#define SV_MODULE_ZERO \
{ \
-1 ,\
-1 ,\
0 ,\
+ -1 ,\
0 ,\
+ -1 ,\
+ -1 \
+}
+
+#define SV_NAME_ZERO \
+{ \
+ -1 ,\
+ -1 ,\
+ -1 ,\
+ -1 ,\
+ -1 ,\
0 ,\
+ -1 ,\
0 ,\
+ -1 ,\
0 ,\
- 0 ,\
- 0 ,\
- 0 ,\
- 0 \
+ -1 ,\
+ -1 \
}
#define SV_ALLTYPE_ZERO \
{ \
- { SV_CLASSIC_LONGRUN_ZERO } ,\
+ SV_TYPE_ZERO ,\
SV_NAME_ZERO ,\
{ 0 } ,\
{ 0 } ,\
@@ -212,8 +234,8 @@ struct sv_alltype_s
0 , \
0 , \
{ 0 } , \
- 0 , \
- 0 , \
+ -1 , \
+ -1 , \
STRALLOC_ZERO , \
0 \
}
@@ -227,11 +249,10 @@ struct keynocheck_s
int idsec ;
int idkey ;
int expected ;
- int mandatory ;
stralloc val ;
} ;
-#define KEYNOCHECK_ZERO { .idsec = -1, .idkey = -1, .expected = -1, .mandatory = -1, .val = STRALLOC_ZERO }
+#define KEYNOCHECK_ZERO { .idsec = -1, .idkey = -1, .expected = -1, .val = STRALLOC_ZERO }
extern keynocheck const keynocheck_zero ;//set in sv_alltype_zero.c
typedef struct section_s section_t,*section_t_ref ;
@@ -242,7 +263,8 @@ struct section_s
stralloc stop ;
stralloc logger ;
stralloc environment ;
- uint32_t idx[5] ; //[0] == 0 -> no, [0] == 1-> yes
+ stralloc regex ;
+ uint32_t idx[6] ; //[0] == 0 -> no, [0] == 1-> yes
char const *file ;
} ;
#define SECTION_ZERO { .main = STRALLOC_ZERO , \
@@ -250,6 +272,7 @@ struct section_s
.stop = STRALLOC_ZERO , \
.logger = STRALLOC_ZERO , \
.environment = STRALLOC_ZERO , \
+ .regex = STRALLOC_ZERO , \
.idx = { 0 } , \
.file = 0 }
@@ -260,26 +283,29 @@ extern void section_free(section_t *sec) ;
extern void freed_parser(void) ;
/** enable phase */
extern void start_parser(stralloc *list,ssexec_t *info, unsigned int *nbsv,uint8_t FORCE) ;
-extern int parser(sv_alltype *service,stralloc *src,char const *svname) ;
-extern int parse_service_check_enabled(ssexec_t *info, char const *svname,uint8_t force,uint8_t *exist) ;
-extern int parse_service_before(ssexec_t *info, stralloc *parsed_list, stralloc *opts_deps_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist) ;
+extern int parser(sv_alltype *service,stralloc *src,char const *svname,int svtype) ;
+extern int parse_service_check_enabled(char const *tree_directory, char const *svname,uint8_t force,uint8_t *exist) ;
+extern int parse_service_before(ssexec_t *info, stralloc *parsed_list, stralloc *opts_deps_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force) ;
extern int parse_service_deps(ssexec_t *info,stralloc *parsed_list, stralloc *opts_deps_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force) ;
extern int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *opts_deps_list,sv_alltype *sv_before,char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force,uint8_t mandatory) ;
extern int parse_add_service(stralloc *parsed_list,sv_alltype *sv_before,char const *service,unsigned int *nbsv,uid_t owner) ;
+extern int get_svtype(sv_alltype *sv_before, char const *contents) ;
/** split */
extern int section_get_range(section_t *sasection,stralloc *src) ;
-extern int key_get_range(genalloc *ga, section_t *sasection,int *svtype) ;
-extern int get_mandatory(genalloc *nocheck,int idsec,int idkey) ;
+extern int key_get_range(genalloc *ga, section_t *sasection) ;
+extern int check_mandatory(sv_alltype *service, section_t *sasection) ;
extern int nocheck_toservice(keynocheck *nocheck,int svtype, sv_alltype *service) ;
/** store */
extern int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype) ;
extern int keep_runfinish(sv_exec *exec,keynocheck *nocheck) ;
extern int keep_logger(sv_execlog *log,keynocheck *nocheck) ;
+extern int keep_environ(sv_alltype *service,keynocheck *nocheck) ;
+extern int keep_regex(sv_module *module,keynocheck *nocheck) ;
/** helper */
extern int add_pipe(sv_alltype *sv, stralloc *sa) ;
/** write */
extern void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun,char const *workdir, genalloc *gasv,ssexec_t *info,uint8_t FORCE,uint8_t CONF) ;
-extern int write_services(ssexec_t *info,sv_alltype *sv, char const *workdir, uint8_t force,uint8_t conf) ;
+extern int write_services(sv_alltype *sv, char const *workdir, uint8_t force,uint8_t conf) ;
extern int write_classic(sv_alltype *sv, char const *dst, uint8_t force, uint8_t conf) ;
extern int write_longrun(sv_alltype *sv,char const *dst, uint8_t force, uint8_t conf) ;
extern int write_oneshot(sv_alltype *sv,char const *dst, uint8_t conf) ;
@@ -291,5 +317,11 @@ extern int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char c
extern int write_consprod(sv_alltype *sv,char const *prodname,char const *consname,char const *proddst,char const *consdst) ;
extern int write_dependencies(unsigned int nga,unsigned int idga,char const *dst,char const *filename) ;
extern int write_env(char const *name,stralloc *sa,char const *dst) ;
-
+extern int write_oneshot_logger(stralloc *destlog, sv_alltype *sv) ;
+/** module */
+extern int parse_module(sv_alltype *sv_before,char const *svname,uid_t owner,uint8_t force) ;
+extern int regex_get_file_name(char *filename,char const *str) ;
+extern int regex_get_replace(char *replace, char const *str) ;
+extern int regex_get_regex(char *regex, char const *str) ;
+extern int regex_replace(int id,unsigned int nid, char const *sdir,mode_t mode) ;
#endif
diff --git a/src/include/66/resolve.h b/src/include/66/resolve.h
index b3bee6d28af10accaf7dc635dadb588dddbbc1a2..a873f1bd4332e1dae313052a40ee1ee99f806f42 100644
--- a/src/include/66/resolve.h
+++ b/src/include/66/resolve.h
@@ -16,11 +16,11 @@
#define SS_RESOLVE_H
#include <stddef.h>
+#include <stdint.h>
#include <skalibs/genalloc.h>
#include <skalibs/stralloc.h>
#include <skalibs/types.h>
-#include <skalibs/uint32.h>
#include <66/ssexec.h>
#include <66/parser.h>
@@ -30,7 +30,7 @@
#define SS_RESOLVE_SRC 1
#define SS_RESOLVE_BACK 2
#define SS_RESOLVE_STATE 3
-#define SS_NOTYPE 0
+#define SS_NOTYPE -1
#define SS_SIMPLE 0
#define SS_DOUBLE 1
@@ -42,6 +42,7 @@ struct ss_resolve_s
uint32_t name ;
uint32_t description ;
+ uint32_t version ;
uint32_t logger ;
uint32_t logreal ;
uint32_t logassoc ;
@@ -66,7 +67,7 @@ struct ss_resolve_s
uint32_t down ;
uint32_t disen ;//disable->0,enable->1
} ;
-#define RESOLVE_ZERO { 0,STRALLOC_ZERO,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+#define RESOLVE_ZERO { 0,STRALLOC_ZERO,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
/** Graph struct */
typedef struct ss_resolve_graph_ndeps_s ss_resolve_graph_ndeps_t ;
@@ -98,8 +99,9 @@ extern ss_resolve_t const ss_resolve_zero ;
extern void ss_resolve_init(ss_resolve_t *res) ;
extern void ss_resolve_free(ss_resolve_t *res) ;
-extern int ss_resolve_pointo(stralloc *sa,ssexec_t *info,unsigned int type, unsigned int where) ;
-extern int ss_resolve_src_path(stralloc *sasrc,char const *sv, ssexec_t *info) ;
+extern int ss_resolve_pointo(stralloc *sa,ssexec_t *info,int type, unsigned int where) ;
+extern int ss_resolve_src_path(stralloc *sasrc,char const *sv, uid_t owner) ;
+extern int ss_resolve_module_path(stralloc *sdir, stralloc *mdir, char const *sv, uid_t owner) ;
extern int ss_resolve_src(stralloc *sasrc, char const *name, char const *src,int *found) ;
extern int ss_resolve_service_isdir(char const *dir, char const *name) ;
extern int ss_resolve_add_uint32(stralloc *sa, uint32_t data) ;
diff --git a/src/include/66/utils.h b/src/include/66/utils.h
index 50490eb92a83d7321030c5f77eff8f316dbc91df..1b7ed270df1d05f34e5e11d4c934f0c29667b30a 100644
--- a/src/include/66/utils.h
+++ b/src/include/66/utils.h
@@ -47,5 +47,6 @@ extern int read_svfile(stralloc *sasv,char const *name,char const *src) ;
extern int instance_check(char const *svname) ;
extern int instance_splitname(stralloc *sa,char const *name,int len,int what) ;
//extern int instance_change_name(stralloc *sa,char const *template,char const *copy) ;
-extern int instance_create(stralloc *sasv,char const *svname, char const *regex, char const *src, int len) ;
+extern int instance_create(stralloc *sasv,char const *svname, char const *regex, int len) ;
+
#endif
diff --git a/src/lib66/backup_cmd_switcher.c b/src/lib66/backup_cmd_switcher.c
index 7fb25e413b114099e190544e8c2b0402ac30f51a..b6363f4406aa346ab6e24ebbafc6f861d21c2428 100644
--- a/src/lib66/backup_cmd_switcher.c
+++ b/src/lib66/backup_cmd_switcher.c
@@ -42,13 +42,14 @@ int backup_switcher(int argc, char const *const *argv,ssexec_t *info)
uint32_t what = -1 ;
int r ;
struct stat st ;
-
+
char const *tree = NULL ;
-
- verbosity = 1 ;
-
- change = back = type = 0 ;
+ verbosity = 1 ;
+
+ change = back = 0 ;
+ type = -1 ;
+
{
subgetopt_t l = SUBGETOPT_ZERO ;
@@ -70,11 +71,11 @@ int backup_switcher(int argc, char const *const *argv,ssexec_t *info)
}
if (argc < 1) return -1 ;
- if ((!change && !back) || !type) return -1 ;
+ if ((!change && !back) || type < 0) return -1 ;
- if (type < CLASSIC || type > ONESHOT)
+ if (type < TYPE_CLASSIC || type > TYPE_ONESHOT)
log_warn_return(LOG_EXIT_LESSONE,"unknown type for backup_switcher") ;
-
+
tree = *argv ;
size_t treelen = strlen(tree) ;
@@ -82,7 +83,7 @@ int backup_switcher(int argc, char const *const *argv,ssexec_t *info)
//base.len-- ;
size_t psymlen ;
char *psym = NULL ;
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
psym = SS_SYM_SVC ;
psymlen = SS_SYM_SVC_LEN ;
@@ -106,20 +107,21 @@ int backup_switcher(int argc, char const *const *argv,ssexec_t *info)
{
if(lstat(sym,&st) < 0) return -1 ;
if(!(S_ISLNK(st.st_mode)))
- log_warn_return(LOG_EXIT_LESSONE,"find symlink: ",sym) ;
-
+ log_warnusys_return(LOG_EXIT_LESSONE,"find symlink: ",sym) ;
+
stralloc symreal = STRALLOC_ZERO ;
-
+
r = sarealpath(&symreal,sym) ;
if (r < 0)
log_warnusys_return(LOG_EXIT_LESSONE,"retrieve real path from: ",sym) ;
-
+
char *b = NULL ;
b = memmem(symreal.s,symreal.len,SS_BACKUP,SS_BACKUP_LEN) ;
-
+
stralloc_free(&symreal) ;
+
if (!b) return SS_SWSRC ;
-
+
return SS_SWBACK ;
}
@@ -130,7 +132,7 @@ int backup_switcher(int argc, char const *const *argv,ssexec_t *info)
char *psrc = NULL ;
char *pback = NULL ;
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
psrc = SS_SVC ;
psrclen = SS_SVC_LEN ;
@@ -186,29 +188,29 @@ int backup_cmd_switcher(unsigned int verbosity,char const *cmd,ssexec_t *info)
int r ;
size_t pos = 0 ;
stralloc opts = STRALLOC_ZERO ;
-
+
if (!sastr_clean_string(&opts,cmd))
log_warnu_return(LOG_EXIT_LESSONE,"clean: ",cmd) ;
-
+
int newopts = 5 + sastr_len(&opts) ;
char const *newargv[newopts] ;
unsigned int m = 0 ;
char fmt[UINT_FMT] ;
fmt[uint_fmt(fmt, verbosity)] = 0 ;
-
+
newargv[m++] = "backup_switcher" ;
newargv[m++] = "-v" ;
newargv[m++] = fmt ;
-
+
for (;pos < opts.len; pos += strlen(opts.s + pos) + 1)
newargv[m++] = opts.s + pos ;
-
+
newargv[m++] = info->treename.s ;
newargv[m++] = 0 ;
-
+
r = backup_switcher(newopts,newargv,info) ;
stralloc_free(&opts) ;
-
+
return r ;
}
diff --git a/src/lib66/backup_make_new.c b/src/lib66/backup_make_new.c
index f52ed5403d65d16daa2524150bbd0bb1ecf7b332..fbf821f2b4934bf96b4bcacdb4d2c3bdd9b90a64 100644
--- a/src/lib66/backup_make_new.c
+++ b/src/lib66/backup_make_new.c
@@ -39,7 +39,7 @@ int backup_make_new(ssexec_t *info, unsigned int type)
size_t typelen ;
char *ptype = NULL ;
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
ptype = SS_SVC ;
typelen = SS_SVC_LEN ;
diff --git a/src/lib66/backup_realpath_sym.c b/src/lib66/backup_realpath_sym.c
index 1cd5b1091f868ef4cb0740f45a87820dc1840edc..23b63c99c6fc73f8787d27773ed25c1c81d39901 100644
--- a/src/lib66/backup_realpath_sym.c
+++ b/src/lib66/backup_realpath_sym.c
@@ -33,7 +33,7 @@ int backup_realpath_sym(stralloc *sa, ssexec_t *info,unsigned int type)
size_t typelen ;
char *ptype = 0 ;
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
ptype = SS_SYM_SVC ;
typelen = SS_SYM_SVC_LEN;
diff --git a/src/lib66/db_switch_to.c b/src/lib66/db_switch_to.c
index a7e193957bf66633779b52df63889fce37e6c156..ecdc12d5f022fdf597e923e22bdc5777bc5d7748 100644
--- a/src/lib66/db_switch_to.c
+++ b/src/lib66/db_switch_to.c
@@ -35,7 +35,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where)
stralloc db = STRALLOC_ZERO ;
char type[UINT_FMT] ;
- size_t typelen = uint_fmt(type, BUNDLE) ;
+ size_t typelen = uint_fmt(type, TYPE_BUNDLE) ;
type[typelen] = 0 ;
size_t cmdlen ;
@@ -56,7 +56,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where)
if (!r && where)
{
log_trace("make a backup of db service for: ",info->treename.s) ;
- if (!backup_make_new(info,LONGRUN))
+ if (!backup_make_new(info,TYPE_LONGRUN))
{
log_warnusys("make a backup of db service for: ",info->treename.s) ;
goto err ;
@@ -72,7 +72,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where)
}
if (db_ok(info->livetree.s, info->treename.s))
{
- if (!backup_realpath_sym(&db,info,LONGRUN))
+ if (!backup_realpath_sym(&db,info,TYPE_LONGRUN))
{
log_warnusys("find path of db: ",db.s) ;
goto err ;
@@ -106,7 +106,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where)
if (db_ok(info->livetree.s,info->treename.s))
{
- if (!backup_realpath_sym(&db,info,LONGRUN))
+ if (!backup_realpath_sym(&db,info,TYPE_LONGRUN))
{
log_warnusys("find path of db: ",db.s) ;
goto err ;
@@ -126,7 +126,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where)
}
}
log_trace("make a backup of db service for: ",info->treename.s) ;
- if (!backup_make_new(info,LONGRUN))
+ if (!backup_make_new(info,TYPE_LONGRUN))
{
log_warnusys("make a backup of db service for: ",info->treename.s) ;
goto err ;
diff --git a/src/lib66/get_enum.c b/src/lib66/get_enum.c
index 3ad1c5e77602b2dba641913bb2e87de3d1ce4556..a0d0bc058d77cdfa7bb9351c9326e93d10718ea0 100644
--- a/src/lib66/get_enum.c
+++ b/src/lib66/get_enum.c
@@ -14,100 +14,205 @@
#include <66/enum.h>
-#include <sys/types.h>
+#include <stddef.h>
#include <oblibs/string.h>
-char const *get_keybyid(key_enum_t key)
+char const *enum_str_section[] = {
+ "main" ,
+ "start" ,
+ "stop" ,
+ "logger" ,
+ "environment" ,
+ "regex" ,
+ 0
+} ;
+
+char const *enum_str_key_section_main[] = {
+ "@type" ,
+ "@name" ,
+ "@version" ,
+ "@description" ,
+ "@contents" ,
+ "@depends" ,
+ "@optsdepends" ,
+ "@extdepends" ,
+ "@options" ,
+ "@notify" ,
+ "@user" ,
+ "@timeout-finish" ,
+ "@timeout-kill" ,
+ "@timeout-up" ,
+ "@timeout-down" ,
+ "@maxdeath" ,
+ "@hiercopy" ,
+ "@down-signal" ,
+ "@flags" ,
+ 0
+} ;
+
+
+char const *enum_str_key_section_startstop[] = {
+ "@build" ,
+ "@runas" ,
+ "@shebang" ,
+ "@execute" ,
+ 0
+} ;
+
+char const *enum_str_key_section_logger[] = {
+ "@build" ,
+ "@runas" ,
+ "@shebang" ,
+ "@execute" ,
+ "@destination" ,
+ "@backup" ,
+ "@maxsize" ,
+ "@timestamp" ,
+ "@timeout-finish" ,
+ "@timeout-kill" ,
+ "@depends" ,
+ 0
+} ;
+
+char const *enum_str_key_section_environ[] = {
+ "@none" ,
+ 0
+} ;
+
+char const *enum_str_key_section_regex[] = {
+ "@configure" ,
+ "@directories" ,
+ "@files" ,
+ "@infiles" ,
+ 0
+} ;
+
+char const *enum_str_type[] = {
+ "classic" ,
+ "bundle" ,
+ "longrun" ,
+ "oneshot" ,
+ "module" ,
+ 0
+} ;
+
+char const *enum_str_expected[] = {
+ "line" ,
+ "bracket" ,
+ "uint" ,
+ "slash" ,
+ "quote" ,
+ "keyval" ,
+ 0
+} ;
+
+char const *enum_str_opts[] = {
+ "log" ,
+ "env" ,
+ "hiercopy" ,
+ "pipeline" ,
+ 0
+} ;
+
+char const *enum_str_flags[] = {
+ "down" ,
+ "nosetsid" ,
+ 0
+} ;
+
+char const *enum_str_build[] = {
+ "auto" ,
+ "custom" ,
+ 0
+} ;
+
+char const *enum_str_mandatory[] = {
+ "need" ,
+ "opts" ,
+ "bundle" ,
+ "custom" ,
+ 0
+} ;
+
+char const *enum_str_time[] = {
+ "tai" ,
+ "iso" ,
+ "none" ,
+ 0
+} ;
+
+char const *enum_str_logopts[] = {
+ "producer-for" ,
+ "consumer-for" ,
+ "pipeline-name" ,
+ 0
+} ;
+
+enum_all_enum_t enum_all[] = {
+
+ [ENUM_SECTION] = { .enum_all = SECTION_ENDOFKEY - ENUM_START, .str = enum_str_section } ,
+ [ENUM_KEY_SECTION_MAIN] = { .enum_all = KEY_MAIN_ENDOFKEY - ENUM_START, .str = enum_str_key_section_main } ,
+ [ENUM_KEY_SECTION_STARTSTOP] = { .enum_all = KEY_STARTSTOP_ENDOFKEY - ENUM_START, .str = enum_str_key_section_startstop } ,
+ [ENUM_KEY_SECTION_LOGGER] = { .enum_all = KEY_LOGGER_ENDOFKEY - ENUM_START, .str = enum_str_key_section_logger } ,
+ [ENUM_KEY_SECTION_ENVIRON] = { .enum_all = KEY_ENVIRON_ENDOFKEY - ENUM_START, .str = enum_str_key_section_environ } ,
+ [ENUM_KEY_SECTION_REGEX] = { .enum_all = KEY_REGEX_ENDOFKEY - ENUM_START, .str = enum_str_key_section_regex } ,
+ [ENUM_TYPE] = { .enum_all = TYPE_ENDOFKEY - ENUM_START, .str = enum_str_type } ,
+ [ENUM_EXPECTED] = { .enum_all = EXPECT_ENDOFKEY - ENUM_START, .str = enum_str_expected } ,
+ [ENUM_OPTS] = { .enum_all = OPTS_ENDOFKEY- ENUM_START , .str = enum_str_opts } ,
+ [ENUM_FLAGS] = { .enum_all = FLAGS_ENDOFKEY - ENUM_START , .str = enum_str_flags } ,
+ [ENUM_BUILD] = { .enum_all = BUILD_ENDOFKEY - ENUM_START , .str = enum_str_build } ,
+ [ENUM_MANDATORY] = { .enum_all = MANDATORY_ENDOFKEY - ENUM_START , .str = enum_str_mandatory } ,
+ [ENUM_TIME] = { .enum_all = TIME_ENDOFKEY - ENUM_START , .str = enum_str_time } ,
+ [ENUM_LOGOPTS] = { .enum_all = LOGOPTS_ENDOFKEY - ENUM_START , .str = enum_str_logopts } ,
+ [ENUM_ENDOFKEY] = { 0 }
+
+} ;
+
+unsigned char const actions[SECTION_ENDOFKEY][TYPE_ENDOFKEY] = {
+
+ // CLASSIC, BUNDLE, LONGRUN, ONESHOT MODULES
+ { ACTION_COMMON, ACTION_COMMON, ACTION_COMMON, ACTION_COMMON, ACTION_COMMON }, // main
+ { ACTION_EXECRUN, ACTION_SKIP, ACTION_EXECRUN, ACTION_EXECUP, ACTION_SKIP }, // start
+ { ACTION_EXECFINISH, ACTION_SKIP, ACTION_EXECFINISH, ACTION_EXECDOWN, ACTION_SKIP }, // stop
+ { ACTION_EXECLOG, ACTION_SKIP, ACTION_EXECLOG, ACTION_SKIP, ACTION_SKIP }, // log
+ { ACTION_ENVIRON, ACTION_SKIP, ACTION_ENVIRON, ACTION_ENVIRON, ACTION_SKIP }, // env
+ { ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_REGEX }, // regex
+} ;
+
+unsigned char const states[SECTION_ENDOFKEY][TYPE_ENDOFKEY] = {
+ // CLASSIC, BUNDLE, LONGRUN, ONESHOT MODULES
+ { SECTION_START, ACTION_SKIP, SECTION_START, SECTION_START, SECTION_REGEX }, // main
+ { SECTION_STOP, ACTION_SKIP, SECTION_STOP, SECTION_STOP, ACTION_SKIP }, // start
+ { SECTION_LOG, ACTION_SKIP, SECTION_LOG, ACTION_SKIP, ACTION_SKIP }, // stop
+ { SECTION_ENV, ACTION_SKIP, SECTION_ENV, SECTION_ENV, ACTION_SKIP }, // log
+ { ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_SKIP }, // env
+ { ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_SKIP, ACTION_SKIP }, // regex
+} ;
+
+ssize_t get_enum_by_key_one(char const *str, int const e)
{
- //Section
- return (key == MAIN) ? "main" :
- (key == START) ? "start" :
- (key == STOP) ? "stop" :
- (key == LOG) ? "logger" :
- (key == ENV) ? "environment" :
- //Main
- (key == TYPE ) ? "@type" :
- (key == NAME ) ? "@name" :
- (key == DESCRIPTION ) ? "@description" :
- (key == CONTENTS ) ? "@contents" :
- (key == DEPENDS ) ? "@depends" :
- (key == OPTSDEPS ) ? "@optsdepends" :
- (key == EXTDEPS ) ? "@extdepends" :
- (key == OPTIONS ) ? "@options" :
- (key == NOTIFY ) ? "@notify" :
- (key == USER ) ? "@user" :
- (key == BUILD ) ? "@build" :
- (key == SIGNAL) ? "@down-signal" :
- (key == FLAGS ) ? "@flags" :
- (key == RUNAS ) ? "@runas" :
- (key == SHEBANG ) ? "@shebang" :
- (key == T_FINISH ) ? "@timeout-finish" :
- (key == T_KILL ) ? "@timeout-kill" :
- (key == T_UP ) ? "@timeout-up" :
- (key == T_DOWN ) ? "@timeout-down" :
- (key == DEATH) ? "@maxdeath" :
- (key == HIERCOPY) ? "@hiercopy" :
- (key == EXEC ) ? "@execute" :
- (key == DESTINATION ) ? "@destination" :
- (key == BACKUP ) ? "@backup" :
- (key == MAXSIZE ) ? "@maxsize" :
- (key == TIMESTP ) ? "@timestamp" :
- //Service type
- (key == CLASSIC ) ? "classic" :
- (key == BUNDLE ) ? "bundle" :
- (key == LONGRUN ) ? "longrun" :
- (key == ONESHOT ) ? "oneshot" :
- //Key expected
- (key == LINE ) ? "line" :
- (key == BRACKET ) ? "bracket" :
- (key == UINT ) ? "uint" :
- (key == SLASH ) ? "slash" :
- (key == QUOTE ) ? "quote" :
- //Options
- (key == LOGGER ) ? "log" :
- (key == ENVIR ) ? "env" :
- (key == HIERCOPY ) ? "hiercopy" :
- (key == PIPELINE ) ? "pipeline" :
- //Flags
- (key == DOWN ) ? "down" :
- (key == NOSETSID ) ? "nosetsid" :
- //Build
- (key == AUTO ) ? "auto" :
- (key == CUSTOM ) ? "custom" :
- //Mandatory
- (key == NEED ) ? "need" :
- (key == OPTS ) ? "opts" :
- //Time
- (key == TAI ) ? "tai" :
- (key == ISO ) ? "iso" :
- (key == NONE ) ? "none" :
- //logger
- (key == PRODUCER ) ? "producer-for" :
- (key == CONSUMER ) ? "consumer-for" :
- "unknown" ;
+ int i = 0 ;
+ enum_all_enum_t *key = enum_all ;
+ for(; i < key[e].enum_all;i++)
+ if(obstr_equal(str,key[e].str[i]))
+ return i ;
+
+ return -1 ;
}
-ssize_t get_enumbyid(char const *str, key_enum_t key_el)
+ssize_t get_enum_by_key(char const *str)
{
- key_enum_t i = 0 ;
+ int i = 0, ret ;
- for (;i<key_el;i++)
- if(obstr_equal(str,get_keybyid(i))) return i ;
-
+ for (;i<ENUM_ENDOFKEY;i++)
+ {
+ ret = get_enum_by_key_one(str,i) ;
+ if (ret >= 0) return ret ;
+ }
return -1 ;
}
-
-int const key_enum_el = ENDOFKEY - MAIN ;
-int const key_enum_section_el = TYPE - MAIN ;
-
-int const key_enum_main_el = CLASSIC - TYPE ;
-int const key_enum_svtype_el = LINE - CLASSIC ;
-int const key_enum_expect_el = LOGGER - LINE ;
-int const key_enum_options_el = DOWN - LOGGER ;
-int const key_enum_flags_el = AUTO - DOWN ;
-int const key_enum_build_el = NEED - AUTO ;
-int const key_enum_mandatory_el = TAI - NEED ;
-int const key_enum_time_el = PRODUCER - TAI ;
-int const key_enum_logger_el = ENDOFKEY - PRODUCER ;
-
+char const *get_key_by_enum(int const e, int const key)
+{
+ return enum_all[e].str[key] ;
+}
diff --git a/src/lib66/instance.c b/src/lib66/instance.c
index 9f7414770ffbca58454eac94115db8cd89d028da..5ae5f6ec69e6128953bd2a5915b517479ba5eeee 100644
--- a/src/lib66/instance.c
+++ b/src/lib66/instance.c
@@ -53,37 +53,36 @@ int instance_splitname(stralloc *sa,char const *name,int len,int what)
sa->len = 0 ;
if (!what)
+ {
if (!stralloc_cats(sa,template) ||
!stralloc_0(sa)) return 0 ;
+ }
else
+ {
if (!stralloc_catb(sa,copy,strlen(copy)) ||
!stralloc_0(sa)) return 0 ;
+ }
return 1 ;
}
-int instance_create(stralloc *sasv,char const *svname, char const *regex, char const *src, int len)
+int instance_create(stralloc *sasv,char const *svname, char const *regex, int len)
{
char const *copy ;
size_t tlen = len + 1 ;
stralloc tmp = STRALLOC_ZERO ;
- char template[tlen + 1] ;
- memcpy(template,svname,tlen) ;
- template[tlen] = 0 ;
-
+ if (!auto_stra(&tmp,sasv->s)) goto err ;
+
copy = svname + tlen ;
- if (!file_readputsa(&tmp,src,template)) {
- log_warnusys("open: ",src,template) ;
- goto err ;
- }
if (!sastr_replace_all(&tmp,regex,copy)){
- log_warnusys("replace instance character at: ",src,template) ;
+ log_warnusys("replace instance character for service: ",svname) ;
goto err ;
}
if (!stralloc_copy(sasv,&tmp)) goto err ;
stralloc_free(&tmp) ;
+
return 1 ;
err:
stralloc_free(&tmp) ;
diff --git a/src/lib66/parser.c b/src/lib66/parser.c
index fb3cc7acce2c7105801ccc9ac169c0047bb42377..1b660df0d94f4826f5745c4fed8db6925a097c19 100644
--- a/src/lib66/parser.c
+++ b/src/lib66/parser.c
@@ -33,51 +33,36 @@
#include <66/parser.h>
-int parser(sv_alltype *service,stralloc *src,char const *svname)
+int parser(sv_alltype *service,stralloc *src,char const *svname,int svtype)
{
- int r , svtype = -1 ;
+ int r ;
size_t i = 0 ;
section_t sasection = SECTION_ZERO ;
genalloc ganocheck = GENALLOC_ZERO ;
sasection.file = svname ;
-
+
r = section_get_range(&sasection,src) ;
if (r <= 0){
log_warnu("parse section of service file: ",svname) ;
goto err ;
}
- if (!sasection.idx[MAIN])
+ if (!sasection.idx[SECTION_MAIN])
{
log_warn("missing section [main] in service file: ", svname) ;
goto err ;
}
- if (!key_get_range(&ganocheck,&sasection,&svtype)) goto err ;
- if (svtype < 0)
- {
- log_warn("invalid value for key: ",get_keybyid(TYPE)," in service file: ",svname) ;
- goto err ;
- }
- if (svtype != BUNDLE && !sasection.idx[START])
+
+ if ((svtype != TYPE_BUNDLE && svtype != TYPE_MODULE) && !sasection.idx[SECTION_START])
{
log_warn("missing section [start] in service file: ", svname) ;
goto err ;
}
+ if (!key_get_range(&ganocheck,&sasection)) goto err ;
if (!genalloc_len(keynocheck,&ganocheck)){
log_warn("empty service file: ",svname) ;
goto err ;
}
- for (i = 0;i < genalloc_len(keynocheck,&ganocheck);i++)
- {
- uint32_t idsec = genalloc_s(keynocheck,&ganocheck)[i].idsec ;
- for (unsigned int j = 0;j < total_list_el[idsec] && total_list[idsec].list > 0;j++)
- {
- if (!get_mandatory(&ganocheck,idsec,j))
- {
- log_warn("mandatory key is missing in service file: ",svname) ;
- goto err ;
- }
- }
- }
+
for (i = 0;i < genalloc_len(keynocheck,&ganocheck);i++)
{
if (!nocheck_toservice(&(genalloc_s(keynocheck,&ganocheck)[i]),svtype,service))
@@ -86,7 +71,10 @@ int parser(sv_alltype *service,stralloc *src,char const *svname)
goto err ;
}
}
- if ((service->opts[1]) && (svtype == LONGRUN))
+
+ if (!check_mandatory(service,&sasection)) goto err ;
+
+ if ((service->opts[1]) && (svtype == TYPE_LONGRUN))
{
if (!add_pipe(service, &deps))
{
@@ -94,7 +82,7 @@ int parser(sv_alltype *service,stralloc *src,char const *svname)
goto err ;
}
}
-
+
section_free(&sasection) ;
genalloc_deepfree(keynocheck,&ganocheck,keynocheck_free) ;
return 1 ;
diff --git a/src/lib66/parser_enabled.c b/src/lib66/parser_enabled.c
index 65acab9b98ba70ba0d2b6745873dbf57d1eb03e4..54a017f530a9b9599cbebc4e6458b6c4114421b6 100644
--- a/src/lib66/parser_enabled.c
+++ b/src/lib66/parser_enabled.c
@@ -15,105 +15,351 @@
#include <66/parser.h>
#include <string.h>
-//#include <stdio.h>
+#include <stdio.h> //rename
#include <oblibs/string.h>
#include <oblibs/types.h>
#include <oblibs/directory.h>
#include <oblibs/log.h>
#include <oblibs/sastr.h>
+#include <oblibs/environ.h>
+#include <oblibs/files.h>
#include <skalibs/stralloc.h>
+#include <skalibs/direntry.h>
+#include <skalibs/djbunix.h>
#include <66/resolve.h>
#include <66/utils.h>
#include <66/constants.h>
#include <66/environ.h>
-int parse_service_check_enabled(ssexec_t *info, char const *svname,uint8_t force,uint8_t *exist)
+int parse_service_before(ssexec_t *info,stralloc *parsed_list,stralloc *tree_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force)
{
- stralloc sares = STRALLOC_ZERO ;
- ss_resolve_t res = RESOLVE_ZERO ;
- int ret = 1 ;
- if (!ss_resolve_pointo(&sares,info,SS_NOTYPE,SS_RESOLVE_SRC))
+ log_trace("start parse process of service: ",sv) ;
+ int insta ;
+ uint8_t exist = 0 ;
+ size_t svlen = strlen(sv), svsrclen, svnamelen ;
+ char svname[svlen + 1], svsrc[svlen + 1] ;
+ if (!ob_basename(svname,sv)) log_warnu_return(LOG_EXIT_ZERO,"get basename of: ",sv) ;
+ if (!ob_dirname(svsrc,sv)) log_warnu_return(LOG_EXIT_ZERO,"get dirname of: ",sv) ;
+ svsrclen = strlen(svsrc) ;
+ svnamelen = strlen(svname) ;
+ char svpath[svsrclen + svnamelen + 1] ;
+ if (scan_mode(sv,S_IFDIR) == 1) return 1 ;
+ char tree[info->tree.len + SS_SVDIRS_LEN + 1] ;
+ auto_strings(tree,info->tree.s,SS_SVDIRS) ;
+
+ int r = parse_service_check_enabled(tree,svname,force,&exist) ;
+ if (!r) goto freed ;
+
+ sv_alltype sv_before = SV_ALLTYPE_ZERO ;
+ sasv->len = 0 ;
+
+ insta = instance_check(svname) ;
+ if (!insta)
+ {
+ log_warn_return(LOG_EXIT_ZERO, "invalid instance name: ",svname) ;
+ }
+ else if (insta > 0)
{
- log_warnusys("set revolve pointer to source") ;
- goto err ;
- }
- if (ss_resolve_check(sares.s,svname))
+ stralloc tmp = STRALLOC_ZERO ;
+ instance_splitname(&tmp,svname,insta,SS_INSTANCE_TEMPLATE) ;
+ if (!read_svfile(sasv,tmp.s,svsrc)) return 0 ;
+ stralloc_free(&tmp) ;
+ }
+ else if (!read_svfile(sasv,svname,svsrc)) return 0 ;
+
+ if (!get_svtype(&sv_before,sasv->s))
+ log_warn_return (LOG_EXIT_ZERO,"invalid value for key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,KEY_MAIN_TYPE)," in service file: ",svsrc,svname) ;
+
+ if (insta > 0)
{
- if (!ss_resolve_read(&res,sares.s,svname))
+ if (!instance_create(sasv,svname,SS_INSTANCE,insta))
+ log_warn_return(LOG_EXIT_ZERO,"create instance service: ",svname) ;
+
+ /** ensure that we have an empty line at the end of the string*/
+ if (!stralloc_cats(sasv,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!stralloc_0(sasv)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+
+ memcpy(svpath,svsrc,svsrclen) ;
+ memcpy(svpath + svsrclen,svname,svnamelen) ;
+ svpath[svsrclen + svnamelen] = 0 ;
+
+ if (sastr_cmp(parsed_list,svpath) >= 0)
+ {
+ log_warn("Ignoring: ",sv," service: already parsed") ;
+ sasv->len = 0 ;
+ sv_alltype_free(&sv_before) ;
+ goto freed ;
+ }
+ if (!parser(&sv_before,sasv,svname,sv_before.cname.itype)) return 0 ;
+
+ /** keep the name set by user
+ * uniquely for instantiated service
+ * The name must contain the template string */
+
+ if (insta > 0 && sv_before.cname.name >= 0 )
+ {
+ stralloc sainsta = STRALLOC_ZERO ;
+ stralloc name = STRALLOC_ZERO ;
+ if (!stralloc_cats(&name,keep.s + sv_before.cname.name)) goto err ;
+
+ if (!instance_splitname(&sainsta,svname,insta,SS_INSTANCE_TEMPLATE)) goto err ;
+ if (sastr_find(&name,sainsta.s) == -1)
{
- log_warnusys("read resolve file of: ",svname) ;
+ log_warn("invalid instantiated service name: ", keep.s + sv_before.cname.name) ;
goto err ;
}
- if (res.disen)
+ stralloc_free(&sainsta) ;
+ stralloc_free(&name) ;
+ goto add ;
+ err:
+ stralloc_free(&sainsta) ;
+ stralloc_free(&name) ;
+ return 0 ;
+ }
+ else
+ {
+ sv_before.cname.name = keep.len ;
+ if (!stralloc_catb(&keep,svname,svnamelen + 1)) return 0 ;
+ }
+ add:
+ if (sv_before.cname.itype == TYPE_MODULE)
+ {
+ r = parse_module(&sv_before,svname,info->owner,force) ;
+ if (!r) return 0 ;
+ else if (r == 2)
+ {
+ sasv->len = 0 ;
+ sv_alltype_free(&sv_before) ;
+ goto deps ;
+ }
+ if (force > 1)
{
- (*exist) = 1 ;
- if (!force) {
- log_warn("Ignoring: ",svname," service: already enabled") ;
- ret = 2 ;
- goto freed ;
- }
+ int wstat ;
+ pid_t pid ;
+ int color = log_color == &log_color_enable ? 1 : 0 ;
+ char const *newargv[9 + color + 1] ;
+ unsigned int m = 0 ;
+ char fmt[UINT_FMT] ;
+ fmt[uint_fmt(fmt,VERBOSITY)] = 0 ;
+
+ newargv[m++] = SS_BINPREFIX "66-disable" ;
+ newargv[m++] = "-v" ;
+ newargv[m++] = fmt ;
+ if (color)
+ newargv[m++] = "-z" ;
+ newargv[m++] = "-l" ;
+ newargv[m++] = info->live.s ;
+ newargv[m++] = "-t" ;
+ newargv[m++] = info->treename.s ;
+ newargv[m++] = svname ;
+ newargv[m++] = 0 ;
+
+ pid = child_spawn0(newargv[0],newargv,(const char *const *)environ) ;
+ if (waitpid_nointr(pid,&wstat, 0) < 0)
+ log_warnusys_return (LOG_EXIT_ZERO,"wait for: 66-disable") ;
+ /** may not be enabled yet, don't crash if it's the case */
+ if (wstat && WEXITSTATUS(wstat) != LOG_EXIT_USER) log_warnu_return(LOG_EXIT_ZERO,"disable module: ",svname) ;
}
}
+ deps:
+ if (!parse_add_service(parsed_list,&sv_before,svpath,nbsv,info->owner)) return 0 ;
+
+ if ((sv_before.cname.itype > TYPE_CLASSIC && force > 1) || !exist)
+ {
+ if (!parse_service_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force)) return 0 ;
+ if (!parse_service_opts_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force,KEY_MAIN_OPTSDEPS)) return 0 ;
+ if (!parse_service_opts_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force,KEY_MAIN_EXTDEPS)) return 0 ;
+ }
freed:
- stralloc_free(&sares) ;
- ss_resolve_free(&res) ;
- return ret ;
- err:
- stralloc_free(&sares) ;
- ss_resolve_free(&res) ;
- return 0 ;
+ return 1 ;
}
-int parse_add_service(stralloc *parsed_list,sv_alltype *sv_before,char const *service,unsigned int *nbsv,uid_t owner)
+/** return 1 if all good
+ * return 0 on crash
+ * return 2 on already enabled */
+int parse_module(sv_alltype *sv_before,char const *svname,uid_t owner,uint8_t force)
{
- stralloc conf = STRALLOC_ZERO ;
- size_t svlen = strlen(service) ;
- // keep source of the frontend file
- sv_before->src = keep.len ;
- if (!stralloc_catb(&keep,service,svlen + 1)) goto err ;
- // keep source of the configuration file
- if (sv_before->opts[2])
+ log_trace("start parse process of module: ",svname) ;
+ int r, insta, err = 1 ;
+ size_t in = 0 , pos = 0, len = 0 ;
+ stralloc mdir = STRALLOC_ZERO ; // module dir
+ stralloc sdir = STRALLOC_ZERO ; // service dir
+ stralloc list = STRALLOC_ZERO ;
+ stralloc tmp = STRALLOC_ZERO ;
+ stralloc sainsta = STRALLOC_ZERO ; // SS_INSTANCE_NAME
+
+ if (!ss_resolve_module_path(&sdir,&mdir,svname,owner)) return 0 ;
+
+ /** keep instance name */
+ insta = instance_check(svname) ;
+ if (!instance_splitname(&sainsta,svname,insta,SS_INSTANCE_NAME))
+ log_warnu_return(LOG_EXIT_ZERO,"get instance name") ;
+
+ r = scan_mode(sdir.s,S_IFDIR) ;
+ if (r < 0) { errno = EEXIST ; log_warnusys_return(LOG_EXIT_ZERO,"conflicting format of: ",sdir.s) ; }
+ else if (!r)
{
- if (!env_resolve_conf(&conf,owner)) goto err ;
- sv_before->srconf = keep.len ;
- if (!stralloc_catb(&keep,conf.s,conf.len + 1)) goto err ;
+ if (!hiercopy(mdir.s,sdir.s))
+ log_warnusys_return(LOG_EXIT_ZERO,"copy: ",mdir.s," to: ",sdir.s) ;
}
- // keep service on current list
- if (!stralloc_catb(parsed_list,service,svlen + 1)) goto err ;
- if (!genalloc_append(sv_alltype,&gasv,sv_before)) goto err ;
- (*nbsv)++ ;
- stralloc_free(&conf) ;
- return 1 ;
- err:
- stralloc_free(&conf) ;
- return 0 ;
+ else
+ {
+ if (force < 2)
+ {
+ log_warn("Ignoring module: ",svname," -- already configured") ;
+ err = 2 ;
+ goto make_deps ;
+ }
+
+ if (rm_rf(sdir.s) < 0)
+ log_warnusys_return (LOG_EXIT_ZERO,"remove: ",sdir.s) ;
+
+ if (!hiercopy(mdir.s,sdir.s))
+ log_warnusys_return(LOG_EXIT_ZERO,"copy: ",mdir.s," to: ",sdir.s) ;
+ }
+
+ /** regex file content */
+ if (!sastr_dir_get_recursive(&list,sdir.s,".configure",S_IFREG))
+ log_warnusys_return(LOG_EXIT_ZERO,"get file(s) of module: ",svname) ;
+
+ pos = sv_before->type.module.start_infiles, len = sv_before->type.module.end_infiles ;
+ for (;pos < len; pos += strlen(keep.s + pos) + 1)
+ {
+ int all = 0 ; int fpos = 0 ;
+ char filename[512] = { 0 } ;
+ char replace[512] = { 0 } ;
+ char regex[512] = { 0 } ;
+ char const *line = keep.s + pos ;
+
+ if (strlen(line) >= 511) log_warn_return(LOG_EXIT_ZERO,"limit exceeded in service: ", svname) ;
+ if ((line[0] != ':') || (get_sep_before(line + 1,':','=') < 0))
+ log_warn_return(LOG_EXIT_ZERO,"bad format in line: ",line," of key @infiles field") ;
+
+ fpos = regex_get_file_name(filename,line) ;
+
+ if (fpos == -1) log_warnu_return(LOG_EXIT_ZERO,"file name of line: ",line) ;
+ else if (fpos < 3) all = 1 ;
+
+ if (!regex_get_replace(replace,line+fpos)) log_warnu_return(LOG_EXIT_ZERO,"replace string of line: ",line) ;
+
+ if (!regex_get_regex(regex,line+fpos)) log_warnu_return(LOG_EXIT_ZERO,"regex string of line: ",line) ;
+
+ for (in = 0 ; in < list.len; in += strlen(list.s + in) + 1)
+ {
+ tmp.len = 0 ;
+ char *str = list.s + in ;
+ size_t len = strlen(str) ;
+ char bname[len + 1] ;
+ char dname[len + 1] ;
+ if (!ob_basename(bname,str)) log_warnu_return(LOG_EXIT_ZERO,"get basename of: ",str) ;
+ if (obstr_equal(bname,filename) || all)
+ {
+ if (!ob_dirname(dname,str)) log_warnu_return(LOG_EXIT_ZERO,"get dirname of: ",str) ;
+ if (!read_svfile(&tmp,bname,dname)) log_warnusys_return(LOG_EXIT_ZERO,"read file: ",str) ;
+ if (!sastr_replace_all(&tmp,replace,regex)) log_warnu_return(LOG_EXIT_ZERO,"replace: ",replace," by: ", regex," in file: ",str) ;
+ if (!file_write_unsafe(dname,bname,tmp.s,tmp.len))
+ log_warnusys_return(LOG_EXIT_ZERO,"write: ",dname,"/","filename") ;
+ }
+ }
+ }
+ /* regex directories name */
+ if (!regex_replace(sv_before->type.module.iddir,sv_before->type.module.ndir,sdir.s,S_IFDIR)) return 0 ;
+ /* regex files name */
+ if (!regex_replace(sv_before->type.module.idfiles,sv_before->type.module.nfiles,sdir.s,S_IFREG)) return 0 ;
+ /* configure script */
+ tmp.len = 0 ;
+ if (!auto_stra(&tmp,sdir.s,"/.configure/configure")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ r = scan_mode(tmp.s,S_IFREG) ;
+ if (r > 0)
+ {
+ int wstat ;
+ pid_t pid ;
+ size_t clen = sv_before->type.module.configure > 0 ? 1 : 0 ;
+ char const *newargv[2 + clen] ;
+ unsigned int m = 0 ;
+
+ newargv[m++] = tmp.s ;
+ if (sv_before->type.module.configure > 0)
+ newargv[m++] = keep.s + sv_before->type.module.configure ;
+ newargv[m++] = 0 ;
+
+ pid = child_spawn0(newargv[0],newargv,(const char *const *)environ) ;
+ if (waitpid_nointr(pid,&wstat, 0) < 0)
+ log_warnusys_return(LOG_EXIT_ZERO,"wait for: ",sdir.s) ;
+
+ if (wstat) log_warnu_return(LOG_EXIT_ZERO,"run: ",sdir.s) ;
+ tmp.len = 0 ;
+ if (!auto_stra(&tmp,sdir.s,"/.configure")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (rm_rf(tmp.s) < 0)
+ log_warnusys_return(LOG_EXIT_ZERO,"remove: ",tmp.s) ;
+ }
+ make_deps:
+ /** get all services */
+ list.len = 0 ;
+ if (!sastr_dir_get_recursive(&list,sdir.s,".configure",S_IFREG))
+ log_warnusys_return(LOG_EXIT_ZERO,"get file(s) of module: ",svname) ;
+
+ /** remake the deps field */
+ size_t id = sv_before->cname.idga, nid = sv_before->cname.nga ;
+ sv_before->cname.idga = deps.len ;
+ sv_before->cname.nga = 0 ;
+ for (;nid; id += strlen(deps.s + id) + 1, nid--)
+ {
+ char *name = deps.s + id ;
+ if (!stralloc_catb(&deps,name,strlen(deps.s + id) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ; ;
+ sv_before->cname.nga++ ;
+ }
+
+ for (pos = 0 ; pos < list.len ; pos += strlen(list.s + pos) + 1)
+ {
+ char *name = list.s + pos ;
+ char bname[len + sainsta.len + 1] ;
+ if (!ob_basename(bname,name)) log_warnu_return(LOG_EXIT_ZERO,"get basename of: ",name) ;
+ insta = get_len_until(bname,'@') ;
+ insta++ ; // keep '@'
+ if (insta > 0)
+ {
+ auto_string_from(bname,insta,sainsta.s) ;
+ }
+ if (!stralloc_catb(&deps,bname,strlen(bname) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ sv_before->cname.nga++ ;
+ }
+
+ stralloc_free(&mdir) ;
+ stralloc_free(&sdir) ;
+ stralloc_free(&list) ;
+ stralloc_free(&tmp) ;
+ stralloc_free(&sainsta) ;
+
+ return err ;
}
int parse_service_deps(ssexec_t *info,stralloc *parsed_list,stralloc *tree_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force)
{
int r ;
- uint8_t exist = 0 ;
char *dname = 0 ;
stralloc newsv = STRALLOC_ZERO ;
+
if (sv_before->cname.nga)
{
size_t id = sv_before->cname.idga, nid = sv_before->cname.nga ;
for (;nid; id += strlen(deps.s + id) + 1, nid--)
{
newsv.len = 0 ;
- exist = 0 ;
- if (sv_before->cname.itype != BUNDLE)
+ if (sv_before->cname.itype != TYPE_BUNDLE)
{
- log_trace("Service : ",sv, " depends on : ",deps.s+id) ;
- }else log_trace("Bundle : ",sv, " contents : ",deps.s+id," as service") ;
+ log_trace("service: ",sv, " depends on: ",deps.s+id) ;
+ }else log_trace("bundle: ",sv, " contents: ",deps.s+id," as service") ;
dname = deps.s + id ;
- r = ss_resolve_src_path(&newsv,dname,info) ;
+ r = ss_resolve_src_path(&newsv,dname,info->owner) ;
if (r < 1) goto err ;//don't warn here, the ss_revolve_src_path already warn user
- if (!parse_service_before(info,parsed_list,tree_list,newsv.s,nbsv,sasv,force,&exist)) goto err ;
+ if (!parse_service_before(info,parsed_list,tree_list,newsv.s,nbsv,sasv,force)) goto err ;
}
}
else log_trace(sv,": haven't dependencies") ;
@@ -128,17 +374,16 @@ int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *tree_
{
int r ;
stralloc newsv = STRALLOC_ZERO ;
- ss_resolve_t res = RESOLVE_ZERO ;
-
+
size_t pos = 0 , baselen = strlen(info->base.s) + SS_SYSTEM_LEN ;
- uint8_t exist = 0, found = 0, ext = 0 ;
+ uint8_t found = 0, ext = 0 ;
char *optname = 0 ;
char btmp[baselen + 1] ;
auto_strings(btmp,info->base.s,SS_SYSTEM) ;
- unsigned int idref = sv_before->cname.idopts ;
+ int idref = sv_before->cname.idopts ;
unsigned int nref = sv_before->cname.nopts ;
- if (mandatory == EXTDEPS) {
+ if (mandatory == KEY_MAIN_EXTDEPS) {
idref = sv_before->cname.idext ;
nref = sv_before->cname.next ;
ext = 1 ;
@@ -169,23 +414,18 @@ int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *tree_
size_t treelen = strlen(tree) ;
char tmp[baselen + 1 + treelen + SS_SVDIRS_LEN + 1] ;
auto_strings(tmp,btmp,"/",tree,SS_SVDIRS) ;
-
- // already added on a tree
- if (ss_resolve_check(tmp,optname))
+
+ parse_service_check_enabled(tmp,optname,force,&found) ;
+ if (found)
{
- if (!ss_resolve_read(&res,tmp,optname)) log_warnusys_return(LOG_EXIT_ZERO,"read resolve file of: ",optname) ;
- if (res.disen)
- {
- found = 1 ;
- log_trace(ext ? "external" : "optional"," service dependency: ",optname," is already enabled at tree: ",btmp,"/",tree) ;
- break ;
- }
+ log_trace(ext ? "external" : "optional"," service dependency: ",optname," is already enabled at tree: ",btmp,"/",tree) ;
+ break ;
}
}
if (!found)
{
// -1 mean system error. If the service doesn't exist it return 0
- r = ss_resolve_src_path(&newsv,optname,info) ;
+ r = ss_resolve_src_path(&newsv,optname,info->owner) ;
if (r == -1) {
goto err ; //don't warn here, the ss_revolve_src_path already warn user
}
@@ -194,7 +434,7 @@ int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *tree_
}
// be paranoid with the else if
else if (r == 1) {
- if (!parse_service_before(info,parsed_list,tree_list,newsv.s,nbsv,sasv,force,&exist))
+ if (!parse_service_before(info,parsed_list,tree_list,newsv.s,nbsv,sasv,force))
goto err ;
// we only keep the first found on optsdepends
if (!ext) break ;
@@ -205,99 +445,158 @@ int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *tree_
}
stralloc_free(&newsv) ;
- ss_resolve_free(&res) ;
return 1 ;
err:
stralloc_free(&newsv) ;
return 0 ;
}
-int parse_service_before(ssexec_t *info,stralloc *parsed_list,stralloc *tree_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist)
+/** General helper */
+
+int parse_service_check_enabled(char const *tree,char const *svname,uint8_t force,uint8_t *exist)
{
-
- int r, insta ;
- size_t svlen = strlen(sv), svsrclen, svnamelen ;
- char svname[svlen + 1], svsrc[svlen + 1] ;
- if (!basename(svname,sv)) return 0 ;
- if (!dirname(svsrc,sv)) return 0 ;
- svsrclen = strlen(svsrc) ;
- svnamelen = strlen(svname) ;
- char svpath[svsrclen + svnamelen + 1] ;
- if (scan_mode(sv,S_IFDIR) == 1) return 1 ;
-
- r = parse_service_check_enabled(info,svname,force,exist) ;
- if (r == 2) goto freed ;
- else if (!r) return 0 ;
-
- sv_alltype sv_before = SV_ALLTYPE_ZERO ;
- sasv->len = 0 ;
+ /** char const tree -> tree.s + SS_SVDIRS */
+ size_t namelen = strlen(svname), newlen = strlen(tree) ;
+ char tmp[newlen + SS_DB_LEN + SS_SRC_LEN + 1 + namelen + 1] ;
+ auto_strings(tmp,tree,SS_DB,SS_SRC,"/",svname) ;
+ /** search in db first, the most used */
+ if (scan_mode(tmp,S_IFDIR) > 0)
+ {
+ (*exist) = 1 ;
+ if (!force) goto found ;
+ }
+ /** svc */
+ auto_string_from(tmp,newlen,SS_SVC,"/",svname) ;
+ if (scan_mode(tmp,S_IFDIR) > 0)
+ {
+ (*exist) = 1 ;
+ if (!force) goto found ;
+ }
- insta = instance_check(svname) ;
- if (!insta)
- log_warn_return(LOG_EXIT_ZERO, "invalid instance name: ",svname) ;
+ return 1 ;
+ found:
+ log_info("Ignoring: ",svname," service: already enabled") ;
+ return 0 ;
+}
- if (insta > 0)
- {
- if (!instance_create(sasv,svname,SS_INSTANCE,svsrc,insta))
- log_warn_return(LOG_EXIT_ZERO,"create instance service: ",svname) ;
-
- /** ensure that we have an empty line at the end of the string*/
- if (!stralloc_cats(sasv,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (!stralloc_0(sasv)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- }else if (!read_svfile(sasv,svname,svsrc)) return 0 ;
-
- memcpy(svpath,svsrc,svsrclen) ;
- memcpy(svpath + svsrclen,svname,svnamelen) ;
- svpath[svsrclen + svnamelen] = 0 ;
-
- if (sastr_cmp(parsed_list,svpath) >= 0)
+
+int parse_add_service(stralloc *parsed_list,sv_alltype *sv_before,char const *service,unsigned int *nbsv,uid_t owner)
+{
+ stralloc conf = STRALLOC_ZERO ;
+ size_t svlen = strlen(service) ;
+ // keep source of the frontend file
+ sv_before->src = keep.len ;
+ if (!stralloc_catb(&keep,service,svlen + 1)) goto err ;
+ // keep source of the configuration file
+ if (sv_before->opts[2])
{
- log_trace(sv,": already added") ;
- sasv->len = 0 ;
- sv_alltype_free(&sv_before) ;
- goto freed ;
+ if (!env_resolve_conf(&conf,owner)) goto err ;
+ sv_before->srconf = keep.len ;
+ if (!stralloc_catb(&keep,conf.s,conf.len + 1)) goto err ;
}
+ // keep service on current list
+ if (!stralloc_catb(parsed_list,service,svlen + 1)) goto err ;
+ if (!genalloc_append(sv_alltype,&gasv,sv_before)) goto err ;
+ (*nbsv)++ ;
+ stralloc_free(&conf) ;
+ return 1 ;
+ err:
+ stralloc_free(&conf) ;
+ return 0 ;
+}
+
+/* module helper */
+
+/* 0 filename undefine
+ * -1 system error
+ * should return at least 2 meaning :: no file define*/
+int regex_get_file_name(char *filename,char const *str)
+{
+ int r ;
+ size_t pos = 0 ;
+ stralloc kp = STRALLOC_ZERO ;
- if (!parser(&sv_before,sasv,svname)) return 0 ;
+ parse_mill_t MILL_GET_COLON = {
+ .open = ':', .close = ':',
+ .skip = " \t\r", .skiplen = 3,
+ .forceclose = 1,
+ .inner.debug = "get_colon" } ;
- /** keep the name set by user
- * uniquely for instantiated service
- * The name must contain the template string */
+ r = mill_element(&kp,str,&MILL_GET_COLON,&pos) ;
+ if (r == -1) goto err ;
- if (insta > 0 && sv_before.cname.name >= 0 )
- {
- stralloc sainsta = STRALLOC_ZERO ;
- stralloc name = STRALLOC_ZERO ;
- if (!stralloc_cats(&name,keep.s + sv_before.cname.name)) goto err ;
+ auto_strings(filename,kp.s) ;
+
+ stralloc_free(&kp) ;
+ return pos ;
+ err:
+ stralloc_free(&kp) ;
+ return -1 ;
+}
+
+int regex_get_replace(char *replace, char const *str)
+{
+ int pos = get_len_until(str,'=') ;
+ if (!pos || pos == -1) return 0 ;
+ char tmp[pos + 1] ;
+ memcpy(tmp,str,pos) ;
+ tmp[pos] = 0 ;
+ auto_strings(replace,tmp) ;
+ return 1 ;
+}
+
+int regex_get_regex(char *regex, char const *str)
+{
+ size_t len = strlen(str) ;
+ int pos = get_len_until(str,'=') ;
+ if (!pos || pos == -1) return 0 ;
+ pos++ ; // remove '='
+ char tmp[len + 1] ;
+ memcpy(tmp,str + pos,len-pos) ;
+ tmp[len-pos] = 0 ;
+ auto_strings(regex,tmp) ;
+ return 1 ;
+}
+
+int regex_replace(int id,unsigned int nid, char const *sdir,mode_t mode)
+{
+ stralloc list = STRALLOC_ZERO ;
+ stralloc tmp = STRALLOC_ZERO ;
+ size_t pos = id, len = nid, in ;
+ if (!sastr_dir_get_recursive(&list,sdir,".configure",mode))
+ log_warnusys_return(LOG_EXIT_ZERO,"get content of: ",sdir) ;
- if (!instance_splitname(&sainsta,svname,insta,0)) goto err ;
- if (sastr_find(&name,sainsta.s) == -1)
- {
- log_warn("invalid instantiated service name: ", keep.s + sv_before.cname.name) ;
- goto err ;
- }
- stralloc_free(&sainsta) ;
- stralloc_free(&name) ;
- goto add ;
- err:
- stralloc_free(&sainsta) ;
- stralloc_free(&name) ;
- return 0 ;
- }
- else
- {
- sv_before.cname.name = keep.len ;
- if (!stralloc_catb(&keep,svname,svnamelen + 1)) return 0 ;
- }
- add:
- if (!parse_add_service(parsed_list,&sv_before,svpath,nbsv,info->owner)) return 0 ;
+ pos = id, len = nid ;
- if ((sv_before.cname.itype > CLASSIC && force > 1) || !(*exist))
+ for (;len; pos += strlen(keep.s + pos) + 1,len--)
{
- if (!parse_service_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force)) return 0 ;
- if (!parse_service_opts_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force,OPTSDEPS)) return 0 ;
- if (!parse_service_opts_deps(info,parsed_list,tree_list,&sv_before,sv,nbsv,sasv,force,EXTDEPS)) return 0 ;
+ char *line = keep.s + pos ;
+ char replace[512] = { 0 } ;
+ char regex[512] = { 0 } ;
+ if (!regex_get_replace(replace,line)) log_warnu_return(LOG_EXIT_ZERO,"replace string of line: ",line) ;
+ if (!regex_get_regex(regex,line)) log_warnu_return(LOG_EXIT_ZERO,"regex string of line: ",line) ;
+
+ for (in = 0 ; in < list.len; in += strlen(list.s + in) + 1)
+ {
+ tmp.len = 0 ;
+ char *str = list.s + in ;
+ size_t len = strlen(str) ;
+ char dname[len + 1] ;
+ if (!ob_dirname(dname,str)) log_warnu_return(LOG_EXIT_ZERO,"get dirname of: ",str) ;
+
+ if (!sabasename(&tmp,str,len)) log_warnusys_return(LOG_EXIT_ZERO,"get basename of: ",str) ;
+ if (!stralloc_0(&tmp)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ if (!sastr_replace(&tmp,replace,regex)) log_warnu_return(LOG_EXIT_ZERO,"replace: ",replace," by: ", regex," in file: ",str) ;
+ char new[len + tmp.len + 1] ;
+ auto_strings(new,dname,tmp.s) ;
+ /** do not try to rename the same directory */
+ if (!obstr_equal(str,new))
+ if (rename(str,new) < 0)
+ log_warnusys_return(LOG_EXIT_ZERO,"rename: ",str," by: ",new) ;
+ }
}
- freed:
+ stralloc_free(&tmp) ;
+ stralloc_free(&list) ;
return 1 ;
}
diff --git a/src/lib66/parser_utils.c b/src/lib66/parser_utils.c
index f0af28d492ef915cf75ad1a02334bb02732693a5..76224b3e42174ce2af942aac166199bd577d25fc 100644
--- a/src/lib66/parser_utils.c
+++ b/src/lib66/parser_utils.c
@@ -21,9 +21,8 @@
#include <sys/types.h>
#include <pwd.h>
#include <errno.h>
-#include <stdio.h>
+//#include <stdio.h>
-#include <oblibs/bytes.h>
#include <oblibs/string.h>
#include <oblibs/files.h>
#include <oblibs/log.h>
@@ -153,7 +152,7 @@ int section_get_range(section_t *sasection,stralloc *src)
if(secname.len && n)
{
skip = section_get_skip(cp.s,pos,MILL_GET_SECTION_NAME.inner.nline) ;
- id = get_enumbyid(secname.s,key_enum_section_el) ;
+ id = get_enum_by_key(secname.s) ;
section_setsa(id,&psasection,sasection) ;
if (skip) sasection->idx[id] = 1 ;
}
@@ -204,7 +203,7 @@ int section_get_range(section_t *sasection,stralloc *src)
return 0 ;
}
-int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
+int key_get_range(genalloc *ga, section_t *sasection)
{
int r ;
size_t pos = 0, fakepos = 0 ;
@@ -213,26 +212,24 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
stralloc_ref psasection ;
key_all_t const *list = total_list ;
- for (int i = 0 ; i < key_enum_section_el ; i++)
+ for (int i = 0 ; i < SECTION_ENDOFKEY ; i++)
{
if (sasection->idx[i])
{
- if (i == ENV)
+ if (i == SECTION_ENV)
{
pos = 0 ;
keynocheck nocheck = KEYNOCHECK_ZERO ;
nocheck.idsec = i ;
- nocheck.idkey = ENVAL ;
- nocheck.expected = KEYVAL ;
- nocheck.mandatory = OPTS ;
+ nocheck.idkey = KEY_ENVIRON_ENVAL ;
+ nocheck.expected = EXPECT_KEYVAL ;
section_setsa(i,&psasection,sasection) ;
if (!stralloc_cats(&nocheck.val,psasection->s+1)) goto err ;//+1 remove the first '\n'
- if (!environ_get_clean_env(&nocheck.val)) { log_warnu("parse section: ",get_keybyid(i)) ; goto err ; }
+ if (!environ_get_clean_env(&nocheck.val)) { log_warnu("parse section: ",get_key_by_enum(ENUM_SECTION,i)) ; goto err ; }
if (!stralloc_cats(&nocheck.val,"\n") ||
!stralloc_0(&nocheck.val)) goto err ;
nocheck.val.len-- ;
-
-
+
if (!genalloc_append(keynocheck,ga,&nocheck)) goto err ;
}
else
@@ -256,16 +253,15 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
for (int j = 0 ; j < total_list_el[i]; j++)
{
found = 0 ;
- if (list[i].list[j].name && obstr_equal(sakey.s,list[i].list[j].name))
+ if (*list[i].list[j].name && obstr_equal(sakey.s,*list[i].list[j].name))
{
nocheck.idsec = i ;
- nocheck.idkey = get_enumbyid(sakey.s,key_enum_el) ;
+ nocheck.idkey = list[i].list[j].id ;
nocheck.expected = list[i].list[j].expected ;
- nocheck.mandatory = list[i].list[j].mandatory ;
found = 1 ;
switch(list[i].list[j].expected)
{
- case QUOTE:
+ case EXPECT_QUOTE:
if (!sastr_get_double_quote(&nocheck.val))
{
parse_err(6,&nocheck) ;
@@ -273,7 +269,7 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
}
if (!stralloc_0(&nocheck.val)) goto err ;
break ;
- case BRACKET:
+ case EXPECT_BRACKET:
if (!parse_bracket(&nocheck.val,&pos))
{
parse_err(6,&nocheck) ;
@@ -285,9 +281,9 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
goto err ;
}
break ;
- case LINE:
- case UINT:
- case SLASH:
+ case EXPECT_LINE:
+ case EXPECT_UINT:
+ case EXPECT_SLASH:
if (!parse_line(&nocheck.val,&pos))
{
parse_err(7,&nocheck) ;
@@ -298,7 +294,6 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
parse_err(9,&nocheck) ;
goto err ;
}
- if (!i && !j) (*svtype) = get_enumbyid(nocheck.val.s,key_enum_el) ;
break ;
default:
return 0 ;
@@ -309,7 +304,7 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
}
if (!found && r >=0)
{
- log_warn("unknown key: ",sakey.s," : in section: ",get_keybyid(sasection->idx[i])) ;
+ log_warn("unknown key: ",sakey.s," : in section: ",get_key_by_enum(ENUM_SECTION,i)) ;
keynocheck_free(&nocheck) ;
goto err ;
}
@@ -325,194 +320,154 @@ int key_get_range(genalloc *ga, section_t *sasection,int *svtype)
return 0 ;
}
-int get_mandatory(genalloc *nocheck,int idsec,int idkey)
+int check_mandatory(sv_alltype *service, section_t *sasection)
{
- int count, bkey, r, countidsec ;
-
- key_all_t const *list = total_list ;
+ if (service->cname.description < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @description at section [start] must be set") ;
+
+ if (!service->user[0])
+ log_warn_return(LOG_EXIT_ZERO,"key @user at section [start] must be set") ;
- stralloc sa = STRALLOC_ZERO ;
+ /** just warn here about the @version field to let the time to implement
+ * it inside all already existing service.
+ * It will be mandatory when 66-backup will be incorporated. */
+ if (service->cname.version < 0)
+ log_warn("key @version at section [start] is missing -- it will be mandatory in the near future") ;
- r = -1 ;
- count = 0 ;
- bkey = -1 ;
- countidsec = 0 ;
-
- switch(list[idsec].list[idkey].mandatory){
+ if (service->opts[2] && !sasection->idx[SECTION_ENV])
+ log_warn_return(LOG_EXIT_ZERO,"options env was asked -- section environment must be set") ;
- case NEED:
- for (unsigned int j = 0;j < genalloc_len(keynocheck,nocheck);j++)
- {
- if (genalloc_s(keynocheck,nocheck)[j].idsec == idsec)
- {
- countidsec++ ;
- if (genalloc_s(keynocheck,nocheck)[j].idkey == get_enumbyid(list[idsec].list[idkey].name,key_enum_el))
- {
- count++ ;
- break ;
- }
- }
- }
- if ((!count) && (countidsec))
- log_warn_return(LOG_EXIT_ZERO,"mandatory key: ",list[idsec].list[idkey].name," not found on section: ",get_keybyid(idsec)) ;
-
+ switch (service->cname.itype)
+ {
+ case TYPE_BUNDLE:
+ if (service->cname.idga < 0)
+ log_warn_return(LOG_EXIT_ZERO,"bundle type detected -- key @contents must be set") ;
break ;
- case CUSTOM:
- for (unsigned int j = 0;j < genalloc_len(keynocheck,nocheck);j++)
- {
-
- if (genalloc_s(keynocheck,nocheck)[j].idsec == idsec)
- {
- countidsec++ ;
- if (genalloc_s(keynocheck,nocheck)[j].idkey == BUILD)
- {
- bkey = j ;
-
- }
-
- if (genalloc_s(keynocheck,nocheck)[j].idkey == get_enumbyid(list[idsec].list[idkey].name,key_enum_el))
- {
- count++ ;
- break ;
- }
- }
- }
- if ((!count) && (countidsec) && bkey>=0)
+ case TYPE_ONESHOT:
+ if (service->type.oneshot.up.build < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @build at section [start] must be set") ;
+
+ if ((service->type.oneshot.up.build == BUILD_CUSTOM) && (service->type.oneshot.up.shebang < 0))
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [start] -- key @shebang must be set") ;
+
+ if (service->type.oneshot.up.exec < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @execute at section [start] must be set") ;
+
+ if (sasection->idx[SECTION_STOP])
{
- if (obstr_equal(genalloc_s(keynocheck,nocheck)[bkey].val.s,get_keybyid(CUSTOM)))
- log_warn_return(LOG_EXIT_ZERO,"custom build asked on section: ",get_keybyid(idsec)," -- key: ",list[idsec].list[idkey].name," must be set") ;
+ if (service->type.oneshot.down.build < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @build at section [stop] must be set") ;
+ if ((service->type.oneshot.down.build == BUILD_CUSTOM) && (service->type.oneshot.down.shebang < 0))
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [stop] -- key @shebang must be set") ;
+ if (service->type.oneshot.down.exec < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @execute at section [stop] must be set") ;
}
break ;
- case BUNDLE:
- for (unsigned int j = 0;j < genalloc_len(keynocheck,nocheck);j++)
- {
- if (genalloc_s(keynocheck,nocheck)[j].idsec == idsec)
- {
- countidsec++ ;
- if (genalloc_s(keynocheck,nocheck)[j].idkey == TYPE)
- {
- bkey = j;
-
- }
- if (genalloc_s(keynocheck,nocheck)[j].idkey == get_enumbyid(list[idsec].list[idkey].name,key_enum_el))
- {
- count++ ;
- }
- }
- }
- if ((!count) && (countidsec) && bkey>=0)
+ case TYPE_CLASSIC:
+ case TYPE_LONGRUN:
+ if (service->type.classic_longrun.run.build < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @build at section [start] must be set") ;
+
+ if ((service->type.classic_longrun.run.build == BUILD_CUSTOM) && (service->type.classic_longrun.run.shebang < 0))
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [start] -- key @shebang must be set") ;
+
+ if (service->type.classic_longrun.run.exec < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @execute at section [start] must be set") ;
+
+ if (sasection->idx[SECTION_STOP])
{
- if (obstr_equal(genalloc_s(keynocheck,nocheck)[bkey].val.s,get_keybyid(BUNDLE)))
- log_warn_return(LOG_EXIT_ZERO,"bundle type detected -- key @contents must be set") ;
+ if (service->type.classic_longrun.finish.build < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @build at section [stop] must be set") ;
+ if ((service->type.classic_longrun.finish.build == BUILD_CUSTOM) && (service->type.classic_longrun.finish.shebang < 0))
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [stop] -- key @shebang must be set") ;
+ if (service->type.classic_longrun.finish.exec < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @execute at section [stop] must be set") ;
}
- break ;
- /** only pass through here to check if flags env was asked
- * and the corresponding section exist*/
- case OPTS:
- for (unsigned int j = 0;j < genalloc_len(keynocheck,nocheck);j++)
+ if (sasection->idx[SECTION_LOG])
{
-
- if (genalloc_s(keynocheck,nocheck)[j].idsec == ENV)
- count++ ;
-
- if (genalloc_s(keynocheck,nocheck)[j].idsec == MAIN)
+ if (service->type.classic_longrun.log.run.build < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @build at section [logger] must be set") ;
+
+ if (service->type.classic_longrun.log.run.build == BUILD_CUSTOM)
{
- if (genalloc_s(keynocheck,nocheck)[j].idkey == OPTIONS)
- {
- bkey = j;
- }
+ if (service->type.classic_longrun.log.run.shebang < 0)
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [logger] -- key @shebang must be set") ;
+ if (service->type.classic_longrun.log.run.exec < 0)
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [logger] -- key @execute must be set") ;
+ if (service->type.classic_longrun.log.destination < 0)
+ log_warn_return(LOG_EXIT_ZERO,"custom build asked on section [logger] -- key @destination must be set") ;
}
- }
- if (bkey >= 0)
- {
- if (!sastr_clean_string(&sa,genalloc_s(keynocheck,nocheck)[bkey].val.s))
- log_warnu_return(LOG_EXIT_ZERO,"clean value of: ",sa.s) ;
-
- r = sastr_cmp(&sa,get_keybyid(ENVIR)) ;
- if ((r >= 0) && (!count))
- log_warn_return(LOG_EXIT_ZERO,"options env was asked -- section environment must be set") ;
- }
+ }
break ;
+ case TYPE_MODULE:
+ /*if (!sasection->idx[SECTION_REGEX])
+ log_warn_return(LOG_EXIT_ZERO,"section [regex] must be set") ;
+ if (service->type.module.iddir < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @directories at section [regex] must be set") ;
+ if (service->type.module.idfiles < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @files at section [regex] must be set") ;
+ if (service->type.module.start_infiles < 0)
+ log_warn_return(LOG_EXIT_ZERO,"key @infiles at section [regex] must be set") ;*/
+ break ;
+ /** really nothing to do here */
default: break ;
}
-
- stralloc_free(&sa) ;
return 1 ;
}
int nocheck_toservice(keynocheck *nocheck,int svtype, sv_alltype *service)
{
- static unsigned char const actions[5][4] = {
- //c->CLASSIC, BUNDLE, LONGRUN, ONESHOT
- { COMMON, COMMON, COMMON, COMMON }, // main
- { EXECRUN, SKIP, EXECRUN, EXECUP }, // start
- { EXECFINISH, SKIP, EXECFINISH, EXECDOWN }, // stop
- { EXECLOG, SKIP, EXECLOG, SKIP }, // log
- { ENVIRON, SKIP, ENVIRON, ENVIRON }, // env
- } ;
- static unsigned char const states[5][4] = {
- //c->CLASSIC, BUNDLE, LONGRUN, ONESHOT
- { START, SKIP, START, START }, // main
- { STOP, SKIP, STOP, STOP }, // start
- { LOG, SKIP, LOG, LOG }, // stop
- { ENV, SKIP, ENV, ENV }, // log
- { SKIP, SKIP, SKIP, SKIP }, // env
-
- } ;
- int p ;
- p = svtype ;
- int state = 0 ;
+ int p = svtype ;
+ int ste = 0 ;
- while (state < 6)
+ while (ste < 7)
{
- unsigned int c = p - CLASSIC;
- unsigned int action = actions[state][c] ;
- state = states[state][c] ;
-
- switch (action) {
- case COMMON:
- if (!nocheck->idsec)
+ unsigned int action = actions[ste][p] ;
+
+ ste = states[ste][p] ;
+
+ switch (action) {
+ case ACTION_COMMON:
+ if (nocheck->idsec == SECTION_MAIN)
if (!keep_common(service,nocheck,svtype))
return 0 ;
-
break ;
- case EXECRUN:
- if (nocheck->idsec == 1)
+ case ACTION_EXECRUN:
+ if (nocheck->idsec == SECTION_START)
if (!keep_runfinish(&service->type.classic_longrun.run,nocheck))
return 0 ;
-
break ;
- case EXECFINISH:
- if (nocheck->idsec == 2)
+ case ACTION_EXECFINISH:
+ if (nocheck->idsec == SECTION_STOP)
if (!keep_runfinish(&service->type.classic_longrun.finish,nocheck))
return 0 ;
-
break ;
- case EXECLOG:
- if (nocheck->idsec == 3)
+ case ACTION_EXECLOG:
+ if (nocheck->idsec == SECTION_LOG)
if (!keep_logger(&service->type.classic_longrun.log,nocheck))
return 0 ;
-
break ;
- case EXECUP:
- if (nocheck->idsec == 1)
+ case ACTION_EXECUP:
+ if (nocheck->idsec == SECTION_START)
if (!keep_runfinish(&service->type.oneshot.up,nocheck))
- return 0 ;
-
+ return 0 ;
break ;
- case EXECDOWN:
- if (nocheck->idsec == 2)
+ case ACTION_EXECDOWN:
+ if (nocheck->idsec == SECTION_STOP)
if (!keep_runfinish(&service->type.oneshot.down,nocheck))
return 0 ;
-
break ;
- case ENVIRON:
- if (nocheck->idsec == 4)
- if (!keep_common(service,nocheck,svtype))
+ case ACTION_ENVIRON:
+ if (nocheck->idsec == SECTION_ENV)
+ if (!keep_environ(service,nocheck))
+ return 0 ;
+ break ;
+ case ACTION_REGEX:
+ if (nocheck->idsec == SECTION_REGEX)
+ if (!keep_regex(&service->type.module,nocheck))
return 0 ;
-
break ;
- case SKIP:
+ case ACTION_SKIP:
break ;
default: log_warn_return(LOG_EXIT_ZERO,"unknown action") ;
}
@@ -529,58 +484,63 @@ int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype)
int r = 0 ;
size_t pos = 0, *chlen = &nocheck->val.len ;
char *chval = nocheck->val.s ;
-
+
switch(nocheck->idkey){
- case TYPE:
+ case KEY_MAIN_TYPE:
r = get_enum(chval,nocheck) ;
- if (!r) return 0 ;
+ if (r == -1) return 0 ;
service->cname.itype = r ;
break ;
- case NAME:
+ case KEY_MAIN_NAME:
service->cname.name = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- case DESCRIPTION:
+ case KEY_MAIN_DESCRIPTION:
service->cname.description = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- case OPTIONS:
+ case KEY_MAIN_VERSION:
+ service->cname.version = keep.len ;
+ if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ break ;
+ case KEY_MAIN_OPTIONS:
if (!get_clean_val(nocheck)) return 0 ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
r = get_enum(chval + pos,nocheck) ;
- if (!r) return 0 ;
- if (svtype == CLASSIC || svtype == LONGRUN)
+ if (r == -1) return 0 ;
+ if (svtype != TYPE_BUNDLE || svtype != TYPE_MODULE)
{
- if (r == LOGGER)
+ if (r == OPTS_LOGGER)
service->opts[0] = 1 ;/**0 means not enabled*/
- else if (svtype == LONGRUN && r == PIPELINE)
+ else if (svtype == TYPE_LONGRUN && r == OPTS_PIPELINE)
service->opts[1] = 1 ;
}
- if (r == ENVIR)
+ if (r == OPTS_ENVIR)
service->opts[2] = 1 ;
}
break ;
- case FLAGS:
+ case KEY_MAIN_FLAGS:
if (!get_clean_val(nocheck)) return 0 ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
r = get_enum(chval + pos,nocheck) ;
- if (!r) return 0 ;
- if (r == DOWN)
+ if (r == -1) return 0 ;
+ if (r == FLAGS_DOWN)
service->flags[0] = 1 ;/**0 means not enabled*/
- if (r == NOSETSID)
+ if (r == FLAGS_NOSETSID)
service->flags[1] = 1 ;
}
break ;
- case USER:
+ case KEY_MAIN_USER:
if (!get_clean_val(nocheck)) return 0 ;
{
+
uid_t owner = MYUID ;
if (!owner)
{
if (sastr_find(&nocheck->val,"root") == -1)
- log_warnu_return(LOG_EXIT_ZERO,"use service: ",keep.s+service->cname.name," -- permission denied") ;
+ log_warnu_return(LOG_EXIT_ZERO,"use the service -- permission denied") ;
}
/** special case, we don't know which user want to use
* the service, we need a general name to allow all user
@@ -588,7 +548,17 @@ int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype)
ssize_t p = sastr_cmp(&nocheck->val,"user") ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
- if (pos == (size_t)p) continue ;
+ if (pos == (size_t)p)
+ {
+ struct passwd *pw = getpwuid(owner);
+ if (!pw)
+ {
+ if (!errno) errno = ESRCH ;
+ log_warnu_return(LOG_EXIT_ZERO,"get user name") ;
+ }
+ scan_uidlist(pw->pw_name,(uid_t *)service->user) ;
+ continue ;
+ }
if (!scan_uidlist(chval + pos,(uid_t *)service->user))
{
parse_err(0,nocheck) ;
@@ -603,11 +573,11 @@ int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype)
if (service->user[i] == owner) e = 1 ;
if (!e)
- log_warnu_return(LOG_EXIT_ZERO,"use service: ",keep.s+service->cname.name," -- permission denied") ;
+ log_warnu_return(LOG_EXIT_ZERO,"use the service -- permission denied") ;
}
}
break ;
- case HIERCOPY:
+ case KEY_MAIN_HIERCOPY:
if (!get_clean_val(nocheck)) return 0 ;
{
unsigned int idx = 0 ;
@@ -621,80 +591,80 @@ int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype)
}
}
break ;
- case DEPENDS:
- if ((service->cname.itype == CLASSIC) || (service->cname.itype == BUNDLE))
- log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
+ case KEY_MAIN_DEPENDS:
+ if ((service->cname.itype == TYPE_CLASSIC) || (service->cname.itype == TYPE_BUNDLE))
+ log_warn_return(LOG_EXIT_ZERO,"key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,nocheck->idkey),": is not valid for type ",get_key_by_enum(ENUM_TYPE,service->cname.itype)) ;
if (!get_clean_val(nocheck)) return 0 ;
service->cname.idga = deps.len ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
if (!stralloc_catb(&deps,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
service->cname.nga++ ;
}
break ;
- case OPTSDEPS:
- if ((service->cname.itype == CLASSIC) || (service->cname.itype == BUNDLE))
- log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
+ case KEY_MAIN_OPTSDEPS:
+ if ((service->cname.itype == TYPE_CLASSIC) || (service->cname.itype == TYPE_BUNDLE))
+ log_warn_return(LOG_EXIT_ZERO,"key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,nocheck->idkey),": is not valid for type ",get_key_by_enum(ENUM_TYPE,service->cname.itype)) ;
if (!get_clean_val(nocheck)) return 0 ;
service->cname.idopts = deps.len ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
if (!stralloc_catb(&deps,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
service->cname.nopts++ ;
}
break ;
- case EXTDEPS:
- if ((service->cname.itype == CLASSIC) || (service->cname.itype == BUNDLE))
- log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
+ case KEY_MAIN_EXTDEPS:
+ if ((service->cname.itype == TYPE_CLASSIC) || (service->cname.itype == TYPE_BUNDLE))
+ log_warn_return(LOG_EXIT_ZERO,"key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,nocheck->idkey),": is not valid for type ",get_key_by_enum(ENUM_TYPE,service->cname.itype)) ;
if (!get_clean_val(nocheck)) return 0 ;
service->cname.idext = deps.len ;
for (;pos < *chlen; pos += strlen(chval + pos)+1)
{
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
if (!stralloc_catb(&deps,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
service->cname.next++ ;
}
break ;
- case CONTENTS:
- if (service->cname.itype != BUNDLE)
- log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
+ case KEY_MAIN_CONTENTS:
+ if (service->cname.itype != TYPE_BUNDLE)
+ log_warn_return(LOG_EXIT_ZERO,"key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,nocheck->idkey),": is not valid for type ",get_key_by_enum(ENUM_TYPE,service->cname.itype)) ;
if (!get_clean_val(nocheck)) return 0 ;
service->cname.idga = deps.len ;
for (;pos < *chlen; pos += strlen(chval + pos) + 1)
{
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
if (!stralloc_catb(&deps,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
service->cname.nga++ ;
}
break ;
- case T_KILL:
- case T_FINISH:
- case T_UP:
- case T_DOWN:
+ case KEY_MAIN_T_KILL:
+ case KEY_MAIN_T_FINISH:
+ case KEY_MAIN_T_UP:
+ case KEY_MAIN_T_DOWN:
if (!get_timeout(nocheck,(uint32_t *)service->timeout)) return 0 ;
break ;
- case DEATH:
+ case KEY_MAIN_DEATH:
if (!get_uint(nocheck,&service->death)) return 0 ;
break ;
- case NOTIFY:
+ case KEY_MAIN_NOTIFY:
if (!get_uint(nocheck,&service->notification)) return 0 ;
break ;
- case ENVAL:
- if (!environ_clean_nline(&nocheck->val))
- log_warnu_return(LOG_EXIT_ZERO,"clean environment value: ",chval) ;
-
- if (!stralloc_cats(&nocheck->val,"\n")) return 0 ;
- if (!stralloc_copy(&service->saenv,&nocheck->val))
- log_warnu_return(LOG_EXIT_ZERO,"store environment value: ",chval) ;
- break ;
- case SIGNAL:
+ case KEY_MAIN_SIGNAL:
if (!sig0_scan(chval,&service->signal))
{
parse_err(3,nocheck) ;
return 0 ;
}
break ;
- default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_keybyid(nocheck->idkey)) ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_key_by_enum(ENUM_KEY_SECTION_MAIN,nocheck->idkey)) ;
}
@@ -706,20 +676,20 @@ int keep_runfinish(sv_exec *exec,keynocheck *nocheck)
int r = 0 ;
size_t *chlen = &nocheck->val.len ;
char *chval = nocheck->val.s ;
-
+
switch(nocheck->idkey)
{
- case BUILD:
+ case KEY_STARTSTOP_BUILD:
r = get_enum(chval,nocheck) ;
- if (!r) return 0 ;
+ if (r == -1) return 0 ;
exec->build = r ;
break ;
- case RUNAS:
+ case KEY_STARTSTOP_RUNAS:
if (!check_valid_runas(nocheck)) return 0 ;
exec->runas = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- case SHEBANG:
+ case KEY_STARTSTOP_SHEBANG:
if (chval[0] != '/')
{
parse_err(4,nocheck) ;
@@ -728,11 +698,11 @@ int keep_runfinish(sv_exec *exec,keynocheck *nocheck)
exec->shebang = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- case EXEC:
+ case KEY_STARTSTOP_EXEC:
exec->exec = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_keybyid(nocheck->idkey)) ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_key_by_enum(ENUM_KEY_SECTION_STARTSTOP,nocheck->idkey)) ;
}
return 1 ;
}
@@ -744,13 +714,13 @@ int keep_logger(sv_execlog *log,keynocheck *nocheck)
char *chval = nocheck->val.s ;
switch(nocheck->idkey){
- case BUILD:
+ case KEY_LOGGER_BUILD:
if (!keep_runfinish(&log->run,nocheck)) return 0 ;
break ;
- case RUNAS:
+ case KEY_LOGGER_RUNAS:
if (!keep_runfinish(&log->run,nocheck)) return 0 ;
break ;
- case DEPENDS:
+ case KEY_LOGGER_DEPENDS:
if (!get_clean_val(nocheck)) return 0 ;
log->idga = deps.len ;
for (;pos < *chlen; pos += strlen(chval + pos) + 1)
@@ -759,17 +729,17 @@ int keep_logger(sv_execlog *log,keynocheck *nocheck)
log->nga++ ;
}
break ;
- case SHEBANG:
+ case KEY_LOGGER_SHEBANG:
if (!keep_runfinish(&log->run,nocheck)) return 0 ;
break ;
- case EXEC:
+ case KEY_LOGGER_EXEC:
if (!keep_runfinish(&log->run,nocheck)) return 0 ;
break ;
- case T_KILL:
- case T_FINISH:
+ case KEY_LOGGER_T_KILL:
+ case KEY_LOGGER_T_FINISH:
if (!get_timeout(nocheck,(uint32_t *)log->timeout)) return 0 ;
break ;
- case DESTINATION:
+ case KEY_LOGGER_DESTINATION:
if (chval[0] != '/')
{
parse_err(4,nocheck) ;
@@ -778,18 +748,91 @@ int keep_logger(sv_execlog *log,keynocheck *nocheck)
log->destination = keep.len ;
if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
break ;
- case BACKUP:
+ case KEY_LOGGER_BACKUP:
if (!get_uint(nocheck,&log->backup)) return 0 ;
break ;
- case MAXSIZE:
+ case KEY_LOGGER_MAXSIZE:
if (!get_uint(nocheck,&log->maxsize)) return 0 ;
break ;
- case TIMESTP:
+ case KEY_LOGGER_TIMESTP:
r = get_enum(chval,nocheck) ;
- if (!r) return 0 ;
+ if (r == -1) return 0 ;
log->timestamp = r ;
break ;
- default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_keybyid(nocheck->idkey)) ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_key_by_enum(ENUM_KEY_SECTION_LOGGER,nocheck->idkey)) ;
+ }
+ return 1 ;
+}
+
+int keep_environ(sv_alltype *service,keynocheck *nocheck)
+{
+ char *chval = nocheck->val.s ;
+
+ switch(nocheck->idkey){
+ case KEY_ENVIRON_ENVAL:
+ if (!environ_clean_nline(&nocheck->val))
+ log_warnu_return(LOG_EXIT_ZERO,"clean environment value: ",chval) ;
+
+ if (!stralloc_cats(&nocheck->val,"\n")) return 0 ;
+ if (!stralloc_copy(&service->saenv,&nocheck->val))
+ log_warnu_return(LOG_EXIT_ZERO,"store environment value: ",chval) ;
+ break ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_key_by_enum(ENUM_KEY_SECTION_ENVIRON,nocheck->idkey)) ;
+ }
+ return 1 ;
+}
+
+int keep_regex(sv_module *module,keynocheck *nocheck)
+{
+ size_t pos = 0, *chlen = &nocheck->val.len ;
+ char *chval = nocheck->val.s ;
+
+ switch(nocheck->idkey){
+ case KEY_REGEX_CONFIGURE:
+ module->configure = keep.len ;
+ if (!stralloc_catb(&keep,chval,*chlen + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ break ;
+ case KEY_REGEX_DIRECTORIES:
+ if (!get_clean_val(nocheck)) return 0 ;
+ module->iddir = keep.len ;
+ for (;pos < *chlen; pos += strlen(chval + pos) + 1)
+ {
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
+ if (!stralloc_catb(&keep,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ module->ndir++ ;
+ }
+ break ;
+ case KEY_REGEX_FILES:
+ if (!get_clean_val(nocheck)) return 0 ;
+ module->idfiles = keep.len ;
+ for (;pos < *chlen; pos += strlen(chval + pos) + 1)
+ {
+ /* allow to comment a service */
+ if (chval[pos] == '#') continue ;
+ if (!stralloc_catb(&keep,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ module->nfiles++ ;
+ }
+ break ;
+ case KEY_REGEX_INFILES:
+ if (!environ_get_clean_env(&nocheck->val))
+ log_warnu_return(LOG_EXIT_ZERO,"clean key ",get_key_by_enum(ENUM_KEY_SECTION_REGEX,nocheck->idkey)," field") ;
+ if (!environ_clean_nline(&nocheck->val))
+ log_warnu_return(LOG_EXIT_ZERO,"clean lines of key ",get_key_by_enum(ENUM_KEY_SECTION_REGEX,nocheck->idkey)," field") ;
+ if (!stralloc_0(&nocheck->val))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ if (!sastr_split_string_in_nline(&nocheck->val))
+ log_warnu_return(LOG_EXIT_SYS,"split lines of key ",get_key_by_enum(ENUM_KEY_SECTION_REGEX,nocheck->idkey)," field") ;
+
+ module->start_infiles = keep.len ;
+ for (;pos < *chlen; pos += strlen(chval + pos) + 1)
+ if (!stralloc_catb(&keep,chval + pos,strlen(chval + pos) + 1))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ module->end_infiles = keep.len ;
+ break ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown key: ",get_key_by_enum(ENUM_KEY_SECTION_REGEX,nocheck->idkey)) ;
}
return 1 ;
}
@@ -809,7 +852,7 @@ int read_svfile(stralloc *sasv,char const *name,char const *src)
memcpy(svtmp + srclen + 1, name, namelen) ;
svtmp[srclen + 1 + namelen] = 0 ;
- log_trace("Read service file of : ",name," from: ",src) ;
+ log_trace("Read service file of: ",src,name) ;
size_t filesize=file_get_size(svtmp) ;
if (!filesize)
@@ -883,11 +926,12 @@ void section_setsa(int id, stralloc_ref *p,section_t *sa)
{
switch(id)
{
- case MAIN: *p = &sa->main ; break ;
- case START: *p = &sa->start ; break ;
- case STOP: *p = &sa->stop ; break ;
- case LOG: *p = &sa->logger ; break ;
- case ENV: *p = &sa->environment ; break ;
+ case SECTION_MAIN: *p = &sa->main ; break ;
+ case SECTION_START: *p = &sa->start ; break ;
+ case SECTION_STOP: *p = &sa->stop ; break ;
+ case SECTION_LOG: *p = &sa->logger ; break ;
+ case SECTION_ENV: *p = &sa->environment ; break ;
+ case SECTION_REGEX: *p = &sa->regex ; break ;
default: break ;
}
}
@@ -909,9 +953,9 @@ int section_get_skip(char const *s,size_t pos,int nline)
return 1 ;
}
-int section_get_id(stralloc *secname, char const *string,size_t *pos,int *id)
+int section_get_id(stralloc *secname, char const *str,size_t *pos,int *id)
{
- size_t len = strlen(string) ;
+ size_t len = strlen(str) ;
size_t newpos = 0 ;
(*id) = -1 ;
@@ -919,42 +963,42 @@ int section_get_id(stralloc *secname, char const *string,size_t *pos,int *id)
{
secname->len = 0 ;
newpos = 0 ;
- if (mill_element(secname,string+(*pos),&MILL_GET_SECTION_NAME,&newpos) == -1) return 0 ;
+ if (mill_element(secname,str+(*pos),&MILL_GET_SECTION_NAME,&newpos) == -1) return 0 ;
if (secname->len)
{
if (!stralloc_0(secname)) return 0 ;
- (*id) = get_enumbyid(secname->s,key_enum_section_el) ;
+ (*id) = get_enum_by_key(secname->s) ;
}
(*pos) += newpos ;
}
return 1 ;
}
-int key_get_next_id(stralloc *sa, char const *string,size_t *pos)
+int key_get_next_id(stralloc *sa, char const *str,size_t *pos)
{
- if (!string) return 0 ;
+ if (!str) return 0 ;
int r = 0 ;
- size_t newpos = 0, len = strlen(string) ;
+ size_t newpos = 0, len = strlen(str) ;
stralloc kp = STRALLOC_ZERO ;
wild_zero_all(&MILL_GET_AROBASE_KEY) ;
wild_zero_all(&MILL_FIRST_BRACKET) ;
int id = -1 ;
- r = mill_element(&kp,string,&MILL_FIRST_BRACKET,&newpos) ;
+ r = mill_element(&kp,str,&MILL_FIRST_BRACKET,&newpos) ;
if (r == -1 || !r) goto err ;
*pos = newpos ;
while (id == -1 && newpos < len)
{
kp.len = 0 ;
- r = mill_element(&kp,string,&MILL_GET_AROBASE_KEY,&newpos) ;
+ r = mill_element(&kp,str,&MILL_GET_AROBASE_KEY,&newpos) ;
if (r == -1) goto err ;
if (!stralloc_0(&kp)) goto err ;
- id = get_enumbyid(kp.s,key_enum_el) ;
+ id = get_enum_by_key(kp.s) ;
//May confusing in case of instantiated service
//if (id == -1 && kp.len > 1) log_warn("unknown key: ",kp.s,": at parenthesis parse") ;
}
- newpos = get_rlen_until(string,')',newpos) ;
+ newpos = get_rlen_until(str,')',newpos) ;
if (newpos == -1) goto err ;
- if (!stralloc_catb(sa,string+*pos,newpos - *pos)) goto err ;
+ if (!stralloc_catb(sa,str+*pos,newpos - *pos)) goto err ;
*pos = newpos + 1 ; //+1 remove the last ')'
stralloc_free(&kp) ;
return 1 ;
@@ -973,13 +1017,13 @@ int get_clean_val(keynocheck *ch)
return 1 ;
}
-int get_enum(char const *string, keynocheck *ch)
+int get_enum(char const *str, keynocheck *ch)
{
- int r = get_enumbyid(string,key_enum_el) ;
+ int r = get_enum_by_key(str) ;
if (r == -1)
{
parse_err(0,ch) ;
- return 0 ;
+ return -1 ;
}
return r ;
}
@@ -987,10 +1031,10 @@ int get_enum(char const *string, keynocheck *ch)
int get_timeout(keynocheck *ch,uint32_t *ui)
{
int time = 0 ;
- if (ch->idkey == T_KILL) time = 0 ;
- else if (ch->idkey == T_FINISH) time = 1 ;
- else if (ch->idkey == T_UP) time = 2 ;
- else if (ch->idkey == T_DOWN) time = 3 ;
+ if ((ch->idkey == KEY_MAIN_T_KILL) || (ch->idkey == KEY_LOGGER_T_KILL)) time = 0 ;
+ else if ((ch->idkey == KEY_MAIN_T_FINISH) || (ch->idkey == KEY_LOGGER_T_FINISH)) time = 1 ;
+ else if (ch->idkey == KEY_MAIN_T_UP) time = 2 ;
+ else if (ch->idkey == KEY_MAIN_T_DOWN) time = 3 ;
if (scan_timeout(ch->val.s,ui,time) == -1)
{
parse_err(3,ch) ;
@@ -1025,40 +1069,65 @@ void parse_err(int ierr,keynocheck *check)
{
int idsec = check->idsec ;
int idkey = check->idkey ;
+ char const *section = get_key_by_enum(ENUM_SECTION,idsec) ;
+ /* start stop enum are the same, enum_all must increase by one to match
+ * the correct list */
+ char const *key = get_key_by_enum(idsec < 2 ? idsec + 1 : idsec,idkey) ;
+
switch(ierr)
{
case 0:
- log_warn("invalid value for key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warn("invalid value for key: ",key,": in section: ",section) ;
break ;
case 1:
- log_warn("multiple definition of key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warn("multiple definition of key: ",key,": in section: ",section) ;
break ;
case 2:
- log_warn("same value for key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warn("same value for key: ",key,": in section: ",section) ;
break ;
case 3:
- log_warn("key: ",get_keybyid(idkey),": must be an integrer value in section: ",get_keybyid(idsec)) ;
+ log_warn("key: ",key,": must be an integrer value in section: ",section) ;
break ;
case 4:
- log_warn("key: ",get_keybyid(idkey),": must be an absolute path in section: ",get_keybyid(idsec)) ;
+ log_warn("key: ",key,": must be an absolute path in section: ",section) ;
break ;
case 5:
- log_warn("key: ",get_keybyid(idkey),": must be set in section: ",get_keybyid(idsec)) ;
+ log_warn("key: ",key,": must be set in section: ",section) ;
break ;
case 6:
- log_warn("invalid format of key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warn("invalid format of key: ",key,": in section: ",section) ;
break ;
case 7:
- log_warnu("parse key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warnu("parse key: ",key,": in section: ",section) ;
break ;
case 8:
- log_warnu("clean value of key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warnu("clean value of key: ",key,": in section: ",section) ;
break ;
case 9:
- log_warn("empty value of key: ",get_keybyid(idkey),": in section: ",get_keybyid(idsec)) ;
+ log_warn("empty value of key: ",key,": in section: ",section) ;
break ;
default:
log_warn("unknown parse_err number") ;
break ;
}
}
+
+int get_svtype(sv_alltype *sv_before, char const *contents)
+{
+ stralloc sa = STRALLOC_ZERO ;
+
+ if (!auto_stra(&sa,contents)) goto err ;
+
+ if (!environ_get_val_of_key(&sa,get_key_by_enum(ENUM_KEY_SECTION_MAIN,KEY_MAIN_TYPE))) goto err ;
+
+ if (!sastr_clean_element(&sa)) goto err ;
+ sv_before->cname.itype = get_enum_by_key(sa.s) ;
+
+ if (sv_before->cname.itype == -1) goto err ;
+
+ stralloc_free(&sa) ;
+ return 1 ;
+ err:
+ stralloc_free(&sa) ;
+ return 0 ;
+}
diff --git a/src/lib66/parser_write.c b/src/lib66/parser_write.c
index 1935808b1e32228da44e3e9cc628e89ec6d17e27..87c45ad4aa6d975b297d6e8810ae4a5309839d87 100644
--- a/src/lib66/parser_write.c
+++ b/src/lib66/parser_write.c
@@ -46,7 +46,7 @@
/** @Return 0 on fail
* @Return 1 on success
* @Return 2 if the service is ignored */
-int write_services(ssexec_t *info,sv_alltype *sv, char const *workdir, uint8_t force, uint8_t conf)
+int write_services(sv_alltype *sv, char const *workdir, uint8_t force, uint8_t conf)
{
int r ;
@@ -60,7 +60,7 @@ int write_services(ssexec_t *info,sv_alltype *sv, char const *workdir, uint8_t f
if (ss_resolve_check(workdir,name))
{
if (!ss_resolve_read(&res,workdir,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
- if (res.type != type && res.disen) log_die(LOG_EXIT_SYS,"Detection of incompatible type format for: ",name," -- current: ",get_keybyid(type)," previous: ",get_keybyid(res.type)) ;
+ if (res.type != type && res.disen) log_die(LOG_EXIT_SYS,"Detection of incompatible type format for: ",name," -- current: ",get_key_by_enum(ENUM_TYPE,type)," previous: ",get_key_by_enum(ENUM_TYPE,res.type)) ;
}
ss_resolve_free(&res) ;
}
@@ -70,7 +70,7 @@ int write_services(ssexec_t *info,sv_alltype *sv, char const *workdir, uint8_t f
memcpy(wname,workdir,workdirlen) ;
wnamelen = workdirlen ;
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
memcpy(wname + wnamelen, SS_SVC, SS_SVC_LEN) ;
memcpy(wname + wnamelen + SS_SVC_LEN, "/", 1) ;
@@ -111,27 +111,28 @@ int write_services(ssexec_t *info,sv_alltype *sv, char const *workdir, uint8_t f
switch(type)
{
- case CLASSIC:
+ case TYPE_CLASSIC:
if (!write_classic(sv, wname, force, conf))
log_warnu_return(LOG_EXIT_ZERO,"write: ",wname) ;
break ;
- case LONGRUN:
+ case TYPE_LONGRUN:
if (!write_longrun(sv, wname, force, conf))
log_warnu_return(LOG_EXIT_ZERO,"write: ",wname) ;
break ;
- case ONESHOT:
+ case TYPE_ONESHOT:
if (!write_oneshot(sv, wname, conf))
log_warnu_return(LOG_EXIT_ZERO,"write: ",wname) ;
break ;
- case BUNDLE:
+ case TYPE_MODULE:
+ case TYPE_BUNDLE:
if (!write_bundle(sv, wname))
log_warnu_return(LOG_EXIT_ZERO,"write: ",wname) ;
break ;
- default: log_warn_return(LOG_EXIT_ZERO,"unkown type: ", get_keybyid(sv->cname.itype)) ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unkown type: ", get_key_by_enum(ENUM_TYPE,sv->cname.itype)) ;
}
return 1 ;
@@ -148,7 +149,7 @@ int write_classic(sv_alltype *sv, char const *dst, uint8_t force,uint8_t conf)
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/run") ;
/** finish file*/
- if (sv->type.classic_longrun.finish.exec)
+ if (sv->type.classic_longrun.finish.exec >= 0)
{
if (!write_exec(sv, &sv->type.classic_longrun.finish,"finish",dst,0755))
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/finish") ;
@@ -181,7 +182,7 @@ int write_longrun(sv_alltype *sv,char const *dst, uint8_t force, uint8_t conf)
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/run") ;
/**finish file*/
- if (sv->type.classic_longrun.finish.exec)
+ if (sv->type.classic_longrun.finish.exec >= 0)
{
if (!write_exec(sv, &sv->type.classic_longrun.finish,"finish",dst,0644))
@@ -215,7 +216,6 @@ int write_longrun(sv_alltype *sv,char const *dst, uint8_t force, uint8_t conf)
int write_oneshot(sv_alltype *sv,char const *dst,uint8_t conf)
{
-
if (!write_common(sv, dst,conf))
log_warnu_return(LOG_EXIT_ZERO,"write common files") ;
@@ -224,12 +224,13 @@ int write_oneshot(sv_alltype *sv,char const *dst,uint8_t conf)
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/up") ;
/** down file*/
- if (sv->type.oneshot.down.exec)
+ if (sv->type.oneshot.down.exec >= 0)
{
if (!write_exec(sv, &sv->type.oneshot.down,"down",dst,0644))
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/down") ;
}
+ /** dependencies */
if (!write_dependencies(sv->cname.nga,sv->cname.idga, dst, "dependencies"))
log_warnu_return(LOG_EXIT_ZERO,"write: ",dst,"/dependencies") ;
@@ -256,11 +257,12 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
uid_t log_uid ;
gid_t log_gid ;
+ uid_t owner = MYUID ;
char *time = 0 ;
char *pmax = 0 ;
char *pback = 0 ;
char *timestamp = "t" ;
- char *logrunner = log->run.runas ? keep.s + log->run.runas : SS_LOGGER_RUNNER ;
+ char *logrunner = log->run.runas >=0 ? keep.s + log->run.runas : SS_LOGGER_RUNNER ;
char max[UINT32_FMT] ;
char back[UINT32_FMT] ;
char const *userhome ;
@@ -271,12 +273,14 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
stralloc ui = STRALLOC_ZERO ;
stralloc exec = STRALLOC_ZERO ;
stralloc destlog = STRALLOC_ZERO ;
-
+
+ /** destination of the temporary directory e.g
+ * /tmp/test:mrNoe5/db/source/service-log */
if(!stralloc_cats(&ddst,dst) ||
!stralloc_cats(&ddst,"/") ||
!stralloc_cats(&ddst,name) ||
!stralloc_0(&ddst)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
-
+
r = scan_mode(ddst.s,S_IFDIR) ;
if (r && force)
{
@@ -298,7 +302,7 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
log_warnusys_return(LOG_EXIT_ZERO,"create ",ddst.s," directory") ;
}
- userhome = get_userhome(MYUID) ;
+ userhome = get_userhome(owner) ;
/**timeout family*/
for (uint32_t i = 0; i < 2;i++)
@@ -316,13 +320,13 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
}
/** dependencies*/
- if (log->nga)
+ if (log->nga > 0)
{
if (!write_dependencies(log->nga,log->idga,ddst.s,"dependencies"))
log_warnu_return(LOG_EXIT_ZERO,"write: ",ddst.s,"/dependencies") ;
}
- if (sv->cname.itype > CLASSIC)
+ if (sv->cname.itype > TYPE_CLASSIC)
{
if (!file_write_unsafe(ddst.s,"type","longrun",7))
log_warnusys_return(LOG_EXIT_ZERO,"write: ",ddst.s,"/type") ;
@@ -330,16 +334,16 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
/**logger section may not be set
* pick auto by default*/
- if (!logbuild)
- logbuild=AUTO ;
+ if (logbuild < 0)
+ logbuild=BUILD_AUTO ;
switch(logbuild)
{
- case AUTO:
+ case BUILD_AUTO:
/** uid */
if (!stralloc_cats(&shebang, "#!" EXECLINE_SHEBANGPREFIX "execlineb -P\n") ||
!stralloc_0(&shebang)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if ((!MYUID))
+ if (!owner)
{
if (!stralloc_cats(&ui,S6_BINPREFIX "s6-setuidgid ") ||
!stralloc_cats(&ui,logrunner)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
@@ -347,9 +351,9 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
if (!stralloc_cats(&ui,"\n") ||
!stralloc_0(&ui)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
/** destination */
- if (!log->destination)
+ if (log->destination < 0)
{
- if(MYUID > 0)
+ if(owner > 0)
{
if (!stralloc_cats(&destlog,userhome) ||
@@ -369,8 +373,8 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
}
if (!stralloc_0(&destlog)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (log->timestamp == ISO) timestamp = "T" ;
- else if (log->timestamp == NONE) timestamp = "" ;
+ if (log->timestamp == TIME_ISO) timestamp = "T" ;
+ else if (log->timestamp == TIME_NONE) timestamp = "" ;
if (log->backup > 0)
{
@@ -394,7 +398,7 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
!stralloc_cats(&exec,S6_BINPREFIX "s6-log -d3 " "n") ||
!stralloc_cats(&exec,pback) ||
!stralloc_cats(&exec," ")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (log->timestamp < NONE)
+ if (log->timestamp < TIME_NONE)
{
if (!stralloc_cats(&exec,timestamp) ||
!stralloc_cats(&exec," ")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
@@ -413,7 +417,7 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
if (!file_write_unsafe(ddst.s,SS_NOTIFICATION,"3\n",2))
log_warnusys_return(LOG_EXIT_ZERO,"write: ",ddst.s,"/" SS_NOTIFICATION) ;
- if (sv->cname.itype == CLASSIC)
+ if (sv->cname.itype == TYPE_CLASSIC)
{
ddst.len-- ;
if (!stralloc_cats(&ddst,"/run") ||
@@ -423,11 +427,11 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
log_warnusys_return(LOG_EXIT_ZERO,"chmod ", ddst.s) ;
}
break;
- case CUSTOM:
+ case BUILD_CUSTOM:
if (!write_exec(sv, &log->run,"run",ddst.s,mode))
log_warnu_return(LOG_EXIT_ZERO,"write: ",ddst.s,"/run") ;
break;
- default: log_warn_return(LOG_EXIT_ZERO,"unknown build value: ",get_keybyid(logbuild)) ;
+ default: log_warn_return(LOG_EXIT_ZERO,"unknown build value: ",get_key_by_enum(ENUM_BUILD,logbuild)) ;
}
r = scan_mode(destlog.s,S_IFDIR) ;
@@ -438,7 +442,7 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
if (!dir_create_parent(destlog.s,0755))
log_warnusys_return(LOG_EXIT_ZERO,"create log directory: ",destlog.s) ;
- if ((!MYUID))
+ if (!owner)
{
if (!youruid(&log_uid,logrunner) ||
!yourgid(&log_gid,log_uid))
@@ -476,15 +480,15 @@ int write_consprod(sv_alltype *sv,char const *prodname,char const *consname,char
char pipefile[consdstlen + 1 + consnamelen + 1 + 1] ;
/**producer-for*/
- if (!file_write_unsafe(consfile,get_keybyid(CONSUMER),prodname,strlen(prodname)))
- log_warnu_return(LOG_EXIT_ZERO,"write: ",consfile,get_keybyid(CONSUMER)) ;
+ if (!file_write_unsafe(consfile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_CONSUMER),prodname,strlen(prodname)))
+ log_warnu_return(LOG_EXIT_ZERO,"write: ",consfile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_CONSUMER)) ;
/**consumer-for*/
- if (!file_write_unsafe(prodfile,get_keybyid(PRODUCER),consname,strlen(consname)))
- log_warnu_return(LOG_EXIT_ZERO,"write: ",prodfile,get_keybyid(PRODUCER)) ;
+ if (!file_write_unsafe(prodfile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_PRODUCER),consname,strlen(consname)))
+ log_warnu_return(LOG_EXIT_ZERO,"write: ",prodfile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_PRODUCER)) ;
/**pipeline**/
- if (sv->opts[1])
+ if (sv->opts[1] > 0)
{
size_t len = strlen(deps.s+sv->pipeline) ;
char pipename[len + 1] ;
@@ -496,8 +500,8 @@ int write_consprod(sv_alltype *sv,char const *prodname,char const *consname,char
memcpy(pipename,deps.s+sv->pipeline,len) ;
pipename[len] = 0 ;
- if (!file_write_unsafe(pipefile,PIPELINE_NAME,pipename,len))
- log_warnu_return(LOG_EXIT_ZERO,"write: ",pipefile,PIPELINE_NAME) ;
+ if (!file_write_unsafe(pipefile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_PIPE),pipename,len))
+ log_warnu_return(LOG_EXIT_ZERO,"write: ",pipefile,get_key_by_enum(ENUM_LOGOPTS,LOGOPTS_PIPE)) ;
}
return 1 ;
@@ -513,20 +517,20 @@ int write_common(sv_alltype *sv, char const *dst,uint8_t conf)
size_t srclen = strlen(src) ;
size_t namelen = strlen(name) ;
/**down file*/
- if (sv->flags[0])
+ if (sv->flags[0] > 0)
{
if (!file_create_empty(dst,"down",0644))
log_warnusys_return(LOG_EXIT_ZERO,"create down file") ;
}
/**nosetsid file*/
- if (sv->flags[1])
+ if (sv->flags[1] > 0)
{
if (!file_create_empty(dst,"nosetsid",0644))
log_warnusys_return(LOG_EXIT_ZERO,"create nosetsid file") ;
}
/**notification-fd*/
- if (sv->notification)
+ if (sv->notification > 0)
{
if (!write_uint(dst,"notification-fd", sv->notification))
log_warnu_return(LOG_EXIT_ZERO,"write notification file") ;
@@ -534,7 +538,7 @@ int write_common(sv_alltype *sv, char const *dst,uint8_t conf)
/**timeout family*/
for (uint32_t i = 0; i < 4;i++)
{
- if (sv->timeout[i][0])
+ if (sv->timeout[i][0] > 0)
{
if (!i)
@@ -552,25 +556,25 @@ int write_common(sv_alltype *sv, char const *dst,uint8_t conf)
}
/** type file*/
- if (sv->cname.itype > CLASSIC)
+ if (sv->cname.itype > TYPE_CLASSIC)
{
- if (!file_write_unsafe(dst,"type",get_keybyid(sv->cname.itype),strlen(get_keybyid(sv->cname.itype))))
+ if (!file_write_unsafe(dst,"type",get_key_by_enum(ENUM_TYPE,sv->cname.itype),strlen(get_key_by_enum(ENUM_TYPE,sv->cname.itype))))
log_warnusys_return(LOG_EXIT_ZERO,"write type file") ;
}
/** max-death-tally */
- if (sv->death)
+ if (sv->death > 0)
{
if (!write_uint(dst, "max-death-tally", sv->death))
log_warnu_return(LOG_EXIT_ZERO,"write max-death-tally file") ;
}
/**down-signal*/
- if (sv->signal)
+ if (sv->signal > 0)
{
if (!write_uint(dst,"down-signal", sv->signal))
log_warnu_return(LOG_EXIT_ZERO,"write down-signal file") ;
}
/** environment */
- if (sv->opts[2])
+ if (sv->opts[2] > 0)
{
char *dst = keep.s + sv->srconf ;
size_t dlen ;
@@ -592,6 +596,7 @@ int write_common(sv_alltype *sv, char const *dst,uint8_t conf)
stralloc salist = STRALLOC_ZERO ;
//merge config from upstream to sysadmin
if (!file_readputsa(&salist,dst,name)) log_warnusys_return(LOG_EXIT_ZERO,"read: ",dst,name) ;
+
if (!env_merge_conf(dst,name,&salist,&sv->saenv,conf))
log_warnu_return(LOG_EXIT_ZERO,"merge environment file") ;
@@ -646,19 +651,35 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
stralloc env = STRALLOC_ZERO ;
stralloc runuser = STRALLOC_ZERO ;
stralloc execute = STRALLOC_ZERO ;
+ stralloc destlog_oneshot = STRALLOC_ZERO ;
+
+ /** prepare oneshot logger */
+ if (!write_oneshot_logger(&destlog_oneshot,sv)) return 0 ;
+ if (type == TYPE_ONESHOT)
+ {
+ if (!stralloc_cats(&shebang,EXECLINE_BINPREFIX "fdmove -c 2 1\n"))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ if (sv->opts[0])
+ {
+ if (!stralloc_cats(&shebang,"redirfd -w 1 ") ||
+ !stralloc_cats(&shebang,destlog_oneshot.s) ||
+ !stralloc_cats(&shebang,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+ }
switch (exec->build)
{
- case AUTO:
+ case BUILD_AUTO:
/** uid */
- if ((!owner && exec->runas))
+ if (!owner && (exec->runas >= 0))
{
if (!stralloc_cats(&ui,S6_BINPREFIX "s6-setuidgid ") ||
!stralloc_cats(&ui,keep.s + exec->runas) ||
!stralloc_cats(&ui,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
/** environment */
- if (sv->opts[2] && (exec->build == AUTO))
+ if (sv->opts[2] && (exec->build == BUILD_AUTO))
{
if (!stralloc_cats(&env,SS_BINPREFIX "execl-envfile ") ||
!stralloc_cats(&env,keep.s + sv->srconf) ||
@@ -666,13 +687,13 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
!stralloc_cats(&env,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
/** shebang */
- if (type != ONESHOT)
+ if (type != TYPE_ONESHOT)
{
if (!stralloc_cats(&shebang, "#!" EXECLINE_SHEBANGPREFIX "execlineb -P\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
break ;
- case CUSTOM:
- if (type != ONESHOT)
+ case BUILD_CUSTOM:
+ if (type != TYPE_ONESHOT)
{
if (!stralloc_cats(&shebang, "#!") ||
!stralloc_cats(&shebang, keep.s+exec->shebang) ||
@@ -684,7 +705,7 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
!stralloc_cats(&shebang," \"")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
break ;
- default: log_warn(LOG_EXIT_ZERO,"unknown ", get_keybyid(exec->build)," build type") ;
+ default: log_warn(LOG_EXIT_ZERO,"unknown ", get_key_by_enum(ENUM_BUILD,exec->build)," build type") ;
break ;
}
/** close uid */
@@ -695,7 +716,7 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
if (!stralloc_0(&shebang)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
/** close command */
if (!stralloc_cats(&runuser, keep.s+exec->exec)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if ((type == ONESHOT) && (exec->build == CUSTOM))
+ if ((type == TYPE_ONESHOT) && (exec->build == BUILD_CUSTOM))
{
if (!stralloc_cats(&runuser," \"")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
@@ -704,14 +725,14 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
/** build the file*/
if (!stralloc_cats(&execute,shebang.s)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (exec->build == AUTO)
+ if ((exec->build == BUILD_AUTO) && (sv->cname.itype != TYPE_ONESHOT))
{
if (!stralloc_cats(&execute,EXECLINE_BINPREFIX "fdmove -c 2 1\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
if (!stralloc_cats(&execute,env.s) ||
!stralloc_cats(&execute,ui.s) ||
!stralloc_cats(&execute,runuser.s)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
-
+
memcpy(write,dst,dstlen) ;
write[dstlen] = '/' ;
memcpy(write + dstlen + 1, file, filelen) ;
@@ -730,6 +751,7 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,mo
stralloc_free(&env) ;
stralloc_free(&runuser) ;
stralloc_free(&execute) ;
+ stralloc_free(&destlog_oneshot) ;
return 1 ;
}
@@ -742,8 +764,8 @@ int write_dependencies(unsigned int nga,unsigned int idga,char const *dst,char c
if (!stralloc_cats(&contents,deps.s + id) ||
!stralloc_cats(&contents,"\n")) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
}
-
- if (contents.len)
+ /** file contents for a bundle must be present even if it's an empty one */
+ if (contents.len || obstr_equal(filename,SS_CONTENTS))
{
if (!file_write_unsafe(dst,filename,contents.s,contents.len))
{
@@ -786,3 +808,63 @@ int write_env(char const *name, stralloc *sa,char const *dst)
return 1 ;
}
+int write_oneshot_logger(stralloc *destlog, sv_alltype *sv)
+{
+ if (sv->opts[0])
+ {
+ int r ;
+ uid_t owner = MYUID ;
+ size_t len ;
+ char const *userhome ;
+ char *svname = keep.s + sv->cname.name ;
+
+ userhome = get_userhome(owner) ;
+
+ //if (sv->type.oneshot.log.destination < 0)
+ {
+ if(owner > 0)
+ {
+ if (!auto_stra(destlog,userhome,"/",SS_LOGGER_USERDIR,svname))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+ else
+ {
+ if (!auto_stra(destlog,SS_LOGGER_SYSDIR,svname))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+ }
+ /** Section logger has no effect with oneshot
+ * this implementation is for the future
+ *
+ else
+ {
+ if (!auto_stra(&destlog,keep.s+log->destination))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+ */
+ r = scan_mode(destlog->s,S_IFDIR) ;
+ if (r == -1)
+ log_warn_return(LOG_EXIT_ZERO,"log directory: ", destlog->s,": already exist with a different mode") ;
+
+ if (!dir_create_parent(destlog->s,0755))
+ log_warnusys_return(LOG_EXIT_ZERO,"create log directory: ",destlog->s) ;
+
+ len = destlog->len ;
+ if (!auto_stra(destlog,"/current"))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ r = scan_mode(destlog->s,S_IFREG) ;
+ if (!r)
+ {
+ destlog->s[len] = 0 ;
+ destlog->len = len ;
+ if (!file_write_unsafe(destlog->s,"current","",0))
+ log_warnusys_return(LOG_EXIT_ZERO,"write: ",destlog->s,"/current") ;
+
+ if (!auto_stra(destlog,"/current"))
+ log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ }
+ }
+
+ return 1 ;
+}
diff --git a/src/lib66/rc_manage.c b/src/lib66/rc_manage.c
index b88eca59997403a7ef3226e99624f06e166c4ef2..354192b60d54f383fc34f998aff18e67011dcb0d 100644
--- a/src/lib66/rc_manage.c
+++ b/src/lib66/rc_manage.c
@@ -58,7 +58,7 @@ int rc_manage(ssexec_t *info,genalloc *ga)
memcpy(live + info->livetree.len + 1,info->treename.s,info->treename.len) ;
live[info->livetree.len + 1 + info->treename.len] = 0 ;
- if (!ss_resolve_pointo(&sares,info,LONGRUN,SS_RESOLVE_SRC))
+ if (!ss_resolve_pointo(&sares,info,TYPE_LONGRUN,SS_RESOLVE_SRC))
{
log_warnusys("set revolve pointer to source") ;
goto err ;
@@ -77,7 +77,7 @@ int rc_manage(ssexec_t *info,genalloc *ga)
char const *runat = string + genalloc_s(ss_resolve_t,ga)[i].runat ;
int type = genalloc_s(ss_resolve_t,ga)[i].type ;
//do not try to copy a bundle or oneshot, this is already done.
- if (type != LONGRUN) continue ;
+ if (type != TYPE_LONGRUN) continue ;
sares.len = newlen ;
if (!stralloc_cats(&sares,name)) goto err ;
if (!stralloc_0(&sares)) goto err ;
diff --git a/src/lib66/resolve.c b/src/lib66/resolve.c
index e45584e08ad768ad8ebdbc8a47126c9960bc9d0e..ae2dc04bbacb57b419e1ab7f3116ce965a94ec37 100644
--- a/src/lib66/resolve.c
+++ b/src/lib66/resolve.c
@@ -17,7 +17,7 @@
#include <stdint.h>
#include <stdlib.h>//realpath
#include <sys/types.h>
-#include <stdio.h>
+//#include <stdio.h>
#include <oblibs/types.h>
#include <oblibs/log.h>
@@ -53,7 +53,7 @@ void ss_resolve_init(ss_resolve_t *res)
ss_resolve_add_string(res,"") ;
}
-int ss_resolve_pointo(stralloc *sa,ssexec_t *info,unsigned int type, unsigned int where)
+int ss_resolve_pointo(stralloc *sa,ssexec_t *info,int type, unsigned int where)
{
stralloc tmp = STRALLOC_ZERO ;
@@ -94,9 +94,9 @@ int ss_resolve_pointo(stralloc *sa,ssexec_t *info,unsigned int type, unsigned in
!stralloc_cats(&tmp,SS_SVDIRS)) goto err ;
}
- if (type && where)
+ if (type >= 0 && where)
{
- if (type == CLASSIC)
+ if (type == TYPE_CLASSIC)
{
if (!stralloc_cats(&tmp,SS_SVC)) goto err ;
}
@@ -113,18 +113,80 @@ int ss_resolve_pointo(stralloc *sa,ssexec_t *info,unsigned int type, unsigned in
return 0 ;
}
-int ss_resolve_src_path(stralloc *sasrc,char const *sv, ssexec_t *info)
+/* @sdir -> service dir
+ * @mdir -> module dir */
+int ss_resolve_module_path(stralloc *sdir, stralloc *mdir, char const *sv, uid_t owner)
+{
+ int r, insta ;
+ stralloc sainsta = STRALLOC_ZERO ;
+ stralloc mhome = STRALLOC_ZERO ; // module user dir
+ stralloc shome = STRALLOC_ZERO ; // service user dir
+ char const *src = 0 ;
+ char const *dest = 0 ;
+
+ insta = instance_check(sv) ;
+ instance_splitname(&sainsta,sv,insta,SS_INSTANCE_TEMPLATE) ;
+
+ if (!owner)
+ {
+ src = SS_MODULE_ADMDIR ;
+ dest = SS_SERVICE_ADMDIR ;
+ }
+ else
+ {
+ if (!set_ownerhome(&mhome,owner)) log_warnusys_return(LOG_EXIT_ZERO,"set home directory") ;
+ if (!stralloc_cats(&mhome,SS_MODULE_USERDIR)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!stralloc_0(&mhome)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ mhome.len-- ;
+ src = mhome.s ;
+
+ if (!set_ownerhome(&shome,owner)) log_warnusys_return(LOG_EXIT_ZERO,"set home directory") ;
+ if (!stralloc_cats(&shome,SS_SERVICE_USERDIR)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!stralloc_0(&shome)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ shome.len-- ;
+ dest = shome.s ;
+
+ }
+ if (!auto_stra(mdir,src,sainsta.s)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ r = scan_mode(mdir->s,S_IFDIR) ;
+ if (!r || r == -1)
+ {
+ mdir->len = 0 ;
+ src = SS_MODULE_ADMDIR ;
+ dest = SS_SERVICE_ADMDIR ;
+ if (!auto_stra(mdir,src,sainsta.s)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ r = scan_mode(mdir->s,S_IFDIR) ;
+ if (!r || r == -1)
+ {
+ mdir->len = 0 ;
+ src = SS_MODULE_SYSDIR ;
+ dest = SS_SERVICE_SYSDIR ;
+ if (!auto_stra(mdir,src,sainsta.s)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ r = scan_mode(mdir->s,S_IFDIR) ;
+ if (!r || r == -1) log_warnu_return(LOG_EXIT_ZERO,"find module: ",sv) ;
+ }
+
+ }
+ if (!auto_stra(sdir,dest,sv)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+
+ stralloc_free(&sainsta) ;
+ stralloc_free(&mhome) ;
+ stralloc_free(&shome) ;
+ return 1 ;
+}
+
+int ss_resolve_src_path(stralloc *sasrc,char const *sv, uid_t owner)
{
int r ;
char const *src = 0 ;
int found = 0, err = -1 ;
stralloc home = STRALLOC_ZERO ;
- if (!info->owner) src = SS_SERVICE_ADMDIR ;
+ if (!owner) src = SS_SERVICE_ADMDIR ;
else
{
- if (!set_ownerhome(&home,info->owner)){ log_warnusys("set home directory") ; goto err ; }
- if (!stralloc_cats(&home,SS_SERVICE_USERDIR)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (!stralloc_0(&home)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!set_ownerhome(&home,owner)) { log_warnusys("set home directory") ; goto err ; }
+ if (!stralloc_cats(&home,SS_SERVICE_USERDIR)) { log_warnsys("stralloc") ; goto err ; }
+ if (!stralloc_0(&home)) { log_warnsys("stralloc") ; goto err ; }
home.len-- ;
src = home.s ;
}
@@ -163,7 +225,7 @@ int ss_resolve_service_isdir(char const *dir, char const *name)
memcpy(t + dirlen + 1, name, namelen) ;
t[dirlen + 1 + namelen] = 0 ;
int r = scan_mode(t,S_IFREG) ;
- if (!basename(t,dir)) return -1 ;
+ if (!ob_basename(t,dir)) return -1 ;
if (!strcmp(t,name) && r) return 1 ;
return 0 ;
}
@@ -217,7 +279,7 @@ int ss_resolve_src(stralloc *sasrc, char const *name, char const *src,int *found
if (insta > 0)
{
- if (!instance_splitname(&sainsta,name,insta,0)) goto errdir ;
+ if (!instance_splitname(&sainsta,name,insta,SS_INSTANCE_TEMPLATE)) goto errdir ;
obr = obstr_equal(sainsta.s,d->d_name) ;
}
@@ -356,6 +418,7 @@ int ss_resolve_pack(stralloc *sa, ss_resolve_t *res)
if (!stralloc_catb(sa,res->sa.s,res->sa.len)) return 0 ;
if(!ss_resolve_add_uint32(sa,res->name) ||
!ss_resolve_add_uint32(sa,res->description) ||
+ !ss_resolve_add_uint32(sa,res->version) ||
!ss_resolve_add_uint32(sa,res->logger) ||
!ss_resolve_add_uint32(sa,res->logreal) ||
!ss_resolve_add_uint32(sa,res->logassoc) ||
@@ -434,6 +497,8 @@ int ss_resolve_read(ss_resolve_t *res, char const *src, char const *name)
global += 4 ;
uint32_unpack_big(sa.s + global,&res->description) ;
global += 4 ;
+ uint32_unpack_big(sa.s + global,&res->version) ;
+ global += 4 ;
uint32_unpack_big(sa.s + global,&res->logger) ;
global += 4 ;
uint32_unpack_big(sa.s + global,&res->logreal) ;
@@ -518,67 +583,6 @@ int ss_resolve_check(char const *src, char const *name)
return 1 ;
}
-int ss_resolve_setlognwrite(ss_resolve_t *sv, char const *dst,ssexec_t *info)
-{
- if (!sv->logger) return 1 ;
-
- ss_state_t sta = STATE_ZERO ;
- ss_resolve_t res = RESOLVE_ZERO ;
- ss_resolve_init(&res) ;
-
- char *string = sv->sa.s ;
- size_t svlen = strlen(string + sv->name) ;
- char descrip[svlen + 7 + 1] ;
- memcpy(descrip,string + sv->name,svlen) ;
- memcpy(descrip + svlen," logger",7) ;
- descrip[svlen + 7] = 0 ;
-
- size_t runlen = strlen(string + sv->runat) ;
- char live[runlen + 4 + 1] ;
- memcpy(live,string + sv->runat,runlen) ;
- if (sv->type >= BUNDLE)
- {
- memcpy(live + runlen,"-log",4) ;
- }else memcpy(live + runlen,"/log",4) ;
- live[runlen + 4] = 0 ;
-
- res.name = ss_resolve_add_string(&res,string + sv->logger) ;
- res.description = ss_resolve_add_string(&res,descrip) ;
- res.logreal = ss_resolve_add_string(&res,string + sv->logreal) ;
- res.logassoc = ss_resolve_add_string(&res,string + sv->name) ;
- res.dstlog = ss_resolve_add_string(&res,string + sv->dstlog) ;
- res.live = ss_resolve_add_string(&res,string + sv->live) ;
- res.runat = ss_resolve_add_string(&res,live) ;
- res.tree = ss_resolve_add_string(&res,string + sv->tree) ;
- res.treename = ss_resolve_add_string(&res,string + sv->treename) ;
- res.state = ss_resolve_add_string(&res,string + sv->state) ;
- res.src = ss_resolve_add_string(&res,string + sv->src) ;
- res.type = sv->type ;
- res.down = sv->down ;
- res.disen = sv->disen ;
-
- if (ss_state_check(string + sv->state,string + sv->logger))
- {
- if (!ss_state_read(&sta,string + sv->state,string + sv->logger)) { log_warnusys("read state file of: ",string + sv->logger) ; goto err ; }
- if (!sta.init)
- ss_state_setflag(&sta,SS_FLAGS_RELOAD,SS_FLAGS_TRUE) ;
- ss_state_setflag(&sta,SS_FLAGS_INIT,SS_FLAGS_FALSE) ;
- ss_state_setflag(&sta,SS_FLAGS_UNSUPERVISE,SS_FLAGS_FALSE) ;
- if (!ss_state_write(&sta,string + sv->state,string + sv->logger)){ log_warnusys("write state file of: ",string + sv->logger) ; goto err ; }
- }
-
- if (!ss_resolve_write(&res,dst,res.sa.s + res.name))
- {
- log_warnusys("write resolve file: ",dst,SS_RESOLVE,"/",res.sa.s + res.name) ;
- goto err ;
- }
- ss_resolve_free(&res) ;
- return 1 ;
- err:
- ss_resolve_free(&res) ;
- return 0 ;
-}
-
int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
{
char ownerstr[UID_FMT] ;
@@ -613,6 +617,9 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
res.name = ss_resolve_add_string(&res,name) ;
res.description = ss_resolve_add_string(&res,keep.s + services->cname.description) ;
+ /*** temporary check here, version is not mandatory yet */
+ if (services->cname.version >= 0)
+ res.version = ss_resolve_add_string(&res,keep.s + services->cname.version) ;
res.tree = ss_resolve_add_string(&res,info->tree.s) ;
res.treename = ss_resolve_add_string(&res,info->treename.s) ;
res.live = ss_resolve_add_string(&res,info->live.s) ;
@@ -620,9 +627,9 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
res.src = ss_resolve_add_string(&res,keep.s + services->src) ;
if (services->srconf)
res.srconf = ss_resolve_add_string(&res,keep.s + services->srconf) ;
- if (services->type.classic_longrun.run.exec)
+ if (services->type.classic_longrun.run.exec >= 0)
res.exec_run = ss_resolve_add_string(&res,keep.s + services->type.classic_longrun.run.exec) ;
- if (services->type.classic_longrun.finish.exec)
+ if (services->type.classic_longrun.finish.exec >= 0)
res.exec_finish = ss_resolve_add_string(&res,keep.s + services->type.classic_longrun.finish.exec) ;
res.type = services->cname.itype ;
res.ndeps = services->cname.nga ;
@@ -631,7 +638,7 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
if (services->flags[0]) res.down = 1 ;
res.disen = 1 ;
- if (res.type == CLASSIC)
+ if (res.type == TYPE_CLASSIC)
{
memcpy(stmp,info->scandir.s,info->scandir.len) ;
@@ -640,7 +647,7 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
stmp[info->scandir.len + 1 + namelen] = 0 ;
res.runat = ss_resolve_add_string(&res,stmp) ;
}
- else if (res.type >= BUNDLE)
+ else if (res.type >= TYPE_BUNDLE)
{
memcpy(stmp,info->livetree.s,info->livetree.len) ;
stmp[info->livetree.len] = '/' ;
@@ -702,29 +709,8 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
}
if (services->opts[0])
{
- memcpy(logname,name,namelen) ;
- memcpy(logname + namelen,SS_LOG_SUFFIX,SS_LOG_SUFFIX_LEN) ;
- logname[namelen + SS_LOG_SUFFIX_LEN] = 0 ;
-
- memcpy(logreal,name,namelen) ;
- if (res.type == CLASSIC)
- {
- memcpy(logreal + namelen,"/log",SS_LOG_SUFFIX_LEN) ;
- }
- else memcpy(logreal + namelen,"-log",SS_LOG_SUFFIX_LEN) ;
- logreal[namelen + SS_LOG_SUFFIX_LEN] = 0 ;
-
- res.logger = ss_resolve_add_string(&res,logname) ;
- res.logreal = ss_resolve_add_string(&res,logreal) ;
- if (ndeps.len) ndeps.len--;
- if (!stralloc_catb(&ndeps," ",1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (!stralloc_cats(&ndeps,res.sa.s + res.logger)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- if (!stralloc_0(&ndeps)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
- res.deps = ss_resolve_add_string(&res,ndeps.s) ;
- if (res.type == CLASSIC) res.ndeps = 1 ;
- else if (res.type == LONGRUN) res.ndeps += 1 ;
// destination of the logger
- if (!services->type.classic_longrun.log.destination)
+ if (services->type.classic_longrun.log.destination < 0)
{
if(info->owner > 0)
{
@@ -747,7 +733,32 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
res.dstlog = ss_resolve_add_string(&res,destlog.s) ;
- if (!ss_resolve_setlognwrite(&res,dst,info)) goto err ;
+ if ((res.type == TYPE_CLASSIC) || (res.type == TYPE_LONGRUN))
+ {
+ memcpy(logname,name,namelen) ;
+ memcpy(logname + namelen,SS_LOG_SUFFIX,SS_LOG_SUFFIX_LEN) ;
+ logname[namelen + SS_LOG_SUFFIX_LEN] = 0 ;
+
+ memcpy(logreal,name,namelen) ;
+ if (res.type == TYPE_CLASSIC)
+ {
+ memcpy(logreal + namelen,"/log",SS_LOG_SUFFIX_LEN) ;
+ }
+ else memcpy(logreal + namelen,"-log",SS_LOG_SUFFIX_LEN) ;
+ logreal[namelen + SS_LOG_SUFFIX_LEN] = 0 ;
+
+ res.logger = ss_resolve_add_string(&res,logname) ;
+ res.logreal = ss_resolve_add_string(&res,logreal) ;
+ if (ndeps.len) ndeps.len--;
+ if (!stralloc_catb(&ndeps," ",1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!stralloc_cats(&ndeps,res.sa.s + res.logger)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ if (!stralloc_0(&ndeps)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ res.deps = ss_resolve_add_string(&res,ndeps.s) ;
+ if (res.type == TYPE_CLASSIC) res.ndeps = 1 ;
+ else if (res.type == TYPE_LONGRUN) res.ndeps += 1 ;
+
+ if (!ss_resolve_setlognwrite(&res,dst,info)) goto err ;
+ }
}
/** may on workdir so a copy with made to source, write it SIMPLE */
if (!ss_resolve_write(&res,dst,res.sa.s + res.name))
@@ -772,6 +783,70 @@ int ss_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst)
return 0 ;
}
+int ss_resolve_setlognwrite(ss_resolve_t *sv, char const *dst,ssexec_t *info)
+{
+ if (!sv->logger) return 1 ;
+
+ ss_state_t sta = STATE_ZERO ;
+ ss_resolve_t res = RESOLVE_ZERO ;
+ ss_resolve_init(&res) ;
+
+ char *string = sv->sa.s ;
+ size_t svlen = strlen(string + sv->name) ;
+ char descrip[svlen + 7 + 1] ;
+ memcpy(descrip,string + sv->name,svlen) ;
+ memcpy(descrip + svlen," logger",7) ;
+ descrip[svlen + 7] = 0 ;
+
+ size_t runlen = strlen(string + sv->runat) ;
+ char live[runlen + 4 + 1] ;
+ memcpy(live,string + sv->runat,runlen) ;
+ if (sv->type >= TYPE_BUNDLE)
+ {
+ memcpy(live + runlen,"-log",4) ;
+ }else memcpy(live + runlen,"/log",4) ;
+ live[runlen + 4] = 0 ;
+
+ res.name = ss_resolve_add_string(&res,string + sv->logger) ;
+ res.description = ss_resolve_add_string(&res,descrip) ;
+ /*** temporary check here, version is not mandatory yet */
+ if (sv->version > 0)
+ res.version = ss_resolve_add_string(&res,string + sv->version) ;
+ res.logreal = ss_resolve_add_string(&res,string + sv->logreal) ;
+ res.logassoc = ss_resolve_add_string(&res,string + sv->name) ;
+ res.dstlog = ss_resolve_add_string(&res,string + sv->dstlog) ;
+ res.live = ss_resolve_add_string(&res,string + sv->live) ;
+ res.runat = ss_resolve_add_string(&res,live) ;
+ res.tree = ss_resolve_add_string(&res,string + sv->tree) ;
+ res.treename = ss_resolve_add_string(&res,string + sv->treename) ;
+ res.state = ss_resolve_add_string(&res,string + sv->state) ;
+ res.src = ss_resolve_add_string(&res,string + sv->src) ;
+ res.type = sv->type ;
+ res.down = sv->down ;
+ res.disen = sv->disen ;
+
+ if (ss_state_check(string + sv->state,string + sv->logger))
+ {
+ if (!ss_state_read(&sta,string + sv->state,string + sv->logger)) { log_warnusys("read state file of: ",string + sv->logger) ; goto err ; }
+ if (!sta.init)
+ ss_state_setflag(&sta,SS_FLAGS_RELOAD,SS_FLAGS_TRUE) ;
+ ss_state_setflag(&sta,SS_FLAGS_INIT,SS_FLAGS_FALSE) ;
+ ss_state_setflag(&sta,SS_FLAGS_UNSUPERVISE,SS_FLAGS_FALSE) ;
+ if (!ss_state_write(&sta,string + sv->state,string + sv->logger)){ log_warnusys("write state file of: ",string + sv->logger) ; goto err ; }
+ }
+
+ if (!ss_resolve_write(&res,dst,res.sa.s + res.name))
+ {
+ log_warnusys("write resolve file: ",dst,SS_RESOLVE,"/",res.sa.s + res.name) ;
+ goto err ;
+ }
+ ss_resolve_free(&res) ;
+ return 1 ;
+ err:
+ ss_resolve_free(&res) ;
+ return 0 ;
+}
+
int ss_resolve_cmp(genalloc *ga,char const *name)
{
unsigned int i = 0 ;
@@ -791,6 +866,7 @@ int ss_resolve_copy(ss_resolve_t *dst,ss_resolve_t *res)
if (!stralloc_catb(&dst->sa,res->sa.s,len)) return 0 ;
dst->name = res->name ;
dst->description = res->description ;
+ dst->version = res->version ;
dst->logger = res->logger ;
dst->logreal = res->logreal ;
dst->logassoc = res->logassoc ;
@@ -880,7 +956,7 @@ int ss_resolve_add_rdeps(genalloc *tokeep, ss_resolve_t *res, char const *src)
memcpy(s + srclen,SS_RESOLVE,SS_RESOLVE_LEN) ;
s[srclen + SS_RESOLVE_LEN] = 0 ;
- if (res->type == CLASSIC) type = 0 ;
+ if (res->type == TYPE_CLASSIC) type = 0 ;
else type = 1 ;
if (!sastr_dir_get(&nsv,s,SS_MASTER+1,S_IFREG)) goto err ;
@@ -889,7 +965,7 @@ int ss_resolve_add_rdeps(genalloc *tokeep, ss_resolve_t *res, char const *src)
{
if (!ss_resolve_append(tokeep,res)) goto err ;
}
- if (res->type == BUNDLE && res->ndeps)
+ if ((res->type == TYPE_BUNDLE || res->type == TYPE_MODULE) && res->ndeps)
{
if (!sastr_clean_string(&tmp,res->sa.s + res->deps)) goto err ;
ss_resolve_t dres = RESOLVE_ZERO ;
@@ -917,7 +993,7 @@ int ss_resolve_add_rdeps(genalloc *tokeep, ss_resolve_t *res, char const *src)
if (!ss_resolve_read(&dres,src,dname)) goto err ;
- if (dres.type == CLASSIC) dtype = 0 ;
+ if (dres.type == TYPE_CLASSIC) dtype = 0 ;
else dtype = 1 ;
if (ss_state_check(dres.sa.s + dres.state,dname))
@@ -926,10 +1002,10 @@ int ss_resolve_add_rdeps(genalloc *tokeep, ss_resolve_t *res, char const *src)
if (dtype != type || (!dres.disen && !sta.unsupervise)){ ss_resolve_free(&dres) ; continue ; }
}
else if (dtype != type || (!dres.disen)){ ss_resolve_free(&dres) ; continue ; }
- if (dres.type == BUNDLE && !dres.ndeps){ ss_resolve_free(&dres) ; continue ; }
+ if (dres.type == TYPE_BUNDLE && !dres.ndeps){ ss_resolve_free(&dres) ; continue ; }
if (!ss_resolve_cmp(tokeep,dname))
{
- if (dres.ndeps)// || (dres.type == BUNDLE && dres.ndeps) || )
+ if (dres.ndeps)// || (dres.type == TYPE_BUNDLE && dres.ndeps) || )
{
if (!sastr_clean_string(&tmp,dres.sa.s + dres.deps)) goto err ;
for (c = 0 ; c < tmp.len ; c += strlen(tmp.s + c) + 1)
@@ -1147,7 +1223,7 @@ int ss_resolve_write_master(ssexec_t *info,ss_resolve_graph_t *graph,char const
res.treename = ss_resolve_add_string(&res,info->treename.s) ;
res.tree = ss_resolve_add_string(&res,info->tree.s) ;
res.live = ss_resolve_add_string(&res,info->live.s) ;
- res.type = BUNDLE ;
+ res.type = TYPE_BUNDLE ;
res.deps = ss_resolve_add_string(&res,inres.s) ;
res.ndeps = genalloc_len(ss_resolve_t,&graph->sorted) ;
res.runat = ss_resolve_add_string(&res,runat) ;
diff --git a/src/lib66/resolve_graph.c b/src/lib66/resolve_graph.c
index 98883783addf12cd4f87ccc3fb529870a7ae99cc..d112e4532ca487e36486f634b2748f261570eced 100644
--- a/src/lib66/resolve_graph.c
+++ b/src/lib66/resolve_graph.c
@@ -187,7 +187,11 @@ int ss_resolve_graph_src(ss_resolve_graph_t *graph, char const *dir, unsigned in
char *name = sa.s + pos ;
if (!ss_resolve_check(dir,name)) goto err ;
if (!ss_resolve_read(&res,dir,name)) goto err ;
- if (!ss_resolve_graph_build(graph,&res,dir,reverse)) goto err ;
+ if (!ss_resolve_graph_build(graph,&res,dir,reverse))
+ {
+ log_warnu("resolve dependencies of service: ",name) ;
+ goto err ;
+ }
}
stralloc_free(&sa) ;
diff --git a/src/lib66/ss_info_utils.c b/src/lib66/ss_info_utils.c
index f45966b7b65aad66197deaabc365c50cd59d1f25..56278f30508ded2c4fb6adfb4f081aa4a4d66c6f 100644
--- a/src/lib66/ss_info_utils.c
+++ b/src/lib66/ss_info_utils.c
@@ -31,6 +31,8 @@
#include <66/resolve.h>
+unsigned int MAXDEPTH = 1 ;
+
ss_resolve_graph_style graph_utf8 = {
UTF_VR UTF_H,
UTF_UR UTF_H,
@@ -195,7 +197,7 @@ void info_graph_display(ss_resolve_t *res, depth_t *depth, int last, int padding
{
s6_svstatus_t status = S6_SVSTATUS_ZERO ;
char *name = res->sa.s + res->name ;
- if (res->type == CLASSIC || res->type == LONGRUN)
+ if (res->type == TYPE_CLASSIC || res->type == TYPE_LONGRUN)
{
s6_svstatus_read(res->sa.s + res->runat ,&status) ;
}
@@ -216,7 +218,7 @@ void info_graph_display(ss_resolve_t *res, depth_t *depth, int last, int padding
depth = depth->next ;
}
- if (!bprintf(buffer_1,"%*s%*s%s(%s%i%s,%s%s%s,%s) %s",level == 1 ? padding : 0,"", style->indent * (depth->level - level), "", tip, status.pid ? log_color->valid : log_color->off,status.pid ? status.pid : 0,log_color->off, res->disen ? log_color->off : log_color->error, res->disen ? "Enabled" : "Disabled",log_color->off,get_keybyid(res->type), name)) return ;
+ if (!bprintf(buffer_1,"%*s%*s%s(%s%i%s,%s%s%s,%s) %s",level == 1 ? padding : 0,"", style->indent * (depth->level - level), "", tip, status.pid ? log_color->valid : log_color->off,status.pid ? status.pid : 0,log_color->off, res->disen ? log_color->off : log_color->error, res->disen ? "Enabled" : "Disabled",log_color->off,get_key_by_enum(ENUM_TYPE,res->type), name)) return ;
if (buffer_putsflush(buffer_1,"\n") < 0) return ;
}
diff --git a/src/lib66/ssexec_dbctl.c b/src/lib66/ssexec_dbctl.c
index 59d58aefc29fc5de2e32637caca9b6b46c839880..65b728942a9c7394b92124043e11a993dfb5b53f 100644
--- a/src/lib66/ssexec_dbctl.c
+++ b/src/lib66/ssexec_dbctl.c
@@ -57,7 +57,7 @@ static void rebuild_list(ss_resolve_graph_t *graph,ssexec_t *info, int what)
if (sta.init) log_die(LOG_EXIT_SYS,"unitialized service: ",name) ;
int type = genalloc_s(ss_resolve_t,&graph->sorted)[i].type ;
- if (type == LONGRUN && genalloc_s(ss_resolve_t,&graph->sorted)[i].disen)
+ if (type == TYPE_LONGRUN && genalloc_s(ss_resolve_t,&graph->sorted)[i].disen)
{
if (!s6_svstatus_read(runat,&status)) log_dieusys(LOG_EXIT_SYS,"read status of: ",runat) ;
isup = status.pid && !status.flagfinishing ;
@@ -113,7 +113,7 @@ static int check_status(genalloc *gares,ssexec_t *info,int signal)
/** do not touch the Master resolve file*/
if (obstr_equal(name,SS_MASTER + 1)) continue ;
/** only check longrun service */
- if (pres->type == LONGRUN)
+ if (pres->type == TYPE_LONGRUN)
{
if (!s6_svstatus_read(pres->sa.s + pres->runat,&status)) log_dieusys(LOG_EXIT_SYS,"read status of: ",pres->sa.s + pres->runat) ;
else if (up)
@@ -151,7 +151,7 @@ static int check_status(genalloc *gares,ssexec_t *info,int signal)
ss_state_setflag(&sta,SS_FLAGS_RELOAD,SS_FLAGS_FALSE) ;
ss_state_setflag(&sta,SS_FLAGS_INIT,SS_FLAGS_FALSE) ;
// ss_state_setflag(&sta,SS_FLAGS_UNSUPERVISE,SS_FLAGS_FALSE) ;
- if (pres->type == BUNDLE || pres->type == ONESHOT)
+ if (pres->type == TYPE_BUNDLE || pres->type == TYPE_ONESHOT)
{
if (up) ss_state_setflag(&sta,SS_FLAGS_STATE,SS_FLAGS_TRUE) ;
else ss_state_setflag(&sta,SS_FLAGS_STATE,SS_FLAGS_FALSE) ;
@@ -278,7 +278,7 @@ int ssexec_dbctl(int argc, char const *const *argv,char const *const *envp,ssexe
char const *name = *argv ;
if (!ss_resolve_check(sares.s,name)) log_diesys(LOG_EXIT_SYS,"unknown service: ",name) ;
if (!ss_resolve_read(&res,sares.s,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
- if (res.type == CLASSIC) log_die(LOG_EXIT_SYS,name," has type classic") ;
+ if (res.type == TYPE_CLASSIC) log_die(LOG_EXIT_SYS,name," has type classic") ;
if (!ss_resolve_append(&gares,&res)) log_dieusys(LOG_EXIT_SYS,"append services selection with: ", name) ;
}
}
diff --git a/src/lib66/ssexec_disable.c b/src/lib66/ssexec_disable.c
index b18954381e60603853636889d0038f41212e5ac5..655a0f5bebb9ddb7072957b973c039bc89424e40 100644
--- a/src/lib66/ssexec_disable.c
+++ b/src/lib66/ssexec_disable.c
@@ -57,7 +57,7 @@ int svc_remove(genalloc *tostop,ss_resolve_t *res, char const *src,ssexec_t *inf
goto err ;
}
if (!stralloc_cats(&dst,src)) goto err ;
- if (cp.type == CLASSIC)
+ if (cp.type == TYPE_CLASSIC)
{
if (!stralloc_cats(&dst,SS_SVC)) goto err ;
}
@@ -145,7 +145,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
genalloc gares = GENALLOC_ZERO ; //ss_resolve_t
ss_resolve_t res = RESOLVE_ZERO ;
ss_resolve_t_ref pres ;
-
+
r = nclassic = nlongrun = stop = logname = 0 ;
{
@@ -172,7 +172,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
for (;*argv;argv++)
{
char const *name = *argv ;
- if (!ss_resolve_check(workdir.s,name)) log_die_nclean(LOG_EXIT_USER,&cleanup,name," is not enabled") ;
+ if (!ss_resolve_check(workdir.s,name)) log_info_nclean_return(LOG_EXIT_ZERO,&cleanup,name," is not enabled") ;
if (!ss_resolve_read(&res,workdir.s,name)) log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"read resolve file of: ",name) ;
if (!ss_resolve_append(&gares,&res)) log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"append services selection with: ",name) ;
}
@@ -197,9 +197,9 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
continue ;
}
if (!svc_remove(&tostop,pres,workdir.s,info))
- log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"remove",name," directory service") ;
+ log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"remove service: ",name) ;
- if (res.type == CLASSIC) nclassic++ ;
+ if (res.type == TYPE_CLASSIC) nclassic++ ;
else nlongrun++ ;
}
diff --git a/src/lib66/ssexec_enable.c b/src/lib66/ssexec_enable.c
index 7de0eb224a70cf70b86034aebd35ebb6a3d0dcad..ca84fd68fe1498f9461606abef4c40444b870064 100644
--- a/src/lib66/ssexec_enable.c
+++ b/src/lib66/ssexec_enable.c
@@ -15,7 +15,7 @@
#include <string.h>
#include <stdint.h>
#include <errno.h>
-//#include <stdio.h>
+#include <stdio.h>
#include <oblibs/obgetopt.h>
#include <oblibs/log.h>
@@ -58,26 +58,17 @@ static void check_identifier(char const *name)
void start_parser(stralloc *list,ssexec_t *info, unsigned int *nbsv,uint8_t FORCE)
{
- int r ;
- uint8_t exist = 0 ;
size_t i = 0, len = list->len ;
-
+
stralloc sasv = STRALLOC_ZERO ;
stralloc parsed_list = STRALLOC_ZERO ;
stralloc tree_list = STRALLOC_ZERO ;
-
+
for (;i < len; i += strlen(list->s + i) + 1)
{
- exist = 0 ;
- char *name = list->s+i ;
- size_t namelen = strlen(name) ;
- char svname[namelen + 1] ;
- if (!basename(svname,name)) log_dieusys(LOG_EXIT_SYS,"get basename of: ", svname) ;
- r = parse_service_check_enabled(info,svname,FORCE,&exist) ;
- if (!r) log_dieu(LOG_EXIT_SYS,"check enabled service: ",svname) ;
- if (r == 2) continue ;
- if (!parse_service_before(info,&parsed_list,&tree_list,name,nbsv,&sasv,FORCE,&exist))
- log_dieu(LOG_EXIT_SYS,"parse service file: ",svname,": or its dependencies") ;
+ char *name = list->s + i ;
+ if (!parse_service_before(info,&parsed_list,&tree_list,name,nbsv,&sasv,FORCE))
+ log_dieu(LOG_EXIT_SYS,"parse service file: ",name,": or its dependencies") ;
}
stralloc_free(&sasv) ;
stralloc_free(&parsed_list) ;
@@ -92,7 +83,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
{
sv_alltype_ref sv = &genalloc_s(sv_alltype,gasv)[i] ;
char *name = keep.s + sv->cname.name ;
- r = write_services(info,sv, workdir,FORCE,CONF) ;
+ r = write_services(sv, workdir,FORCE,CONF) ;
if (!r)
log_dieu_nclean(LOG_EXIT_SYS,&cleanup,"write service: ",name) ;
@@ -105,7 +96,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
log_trace("Service written successfully: ", name) ;
if (sastr_cmp(tostart,name) == -1)
{
- if (sv->cname.itype == CLASSIC) (*nclassic)++ ;
+ if (sv->cname.itype == TYPE_CLASSIC) (*nclassic)++ ;
else (*nlongrun)++ ;
if (!sastr_add_string(tostart,name))
log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"stralloc") ;
@@ -157,7 +148,7 @@ int ssexec_enable(int argc, char const *const *argv,char const *const *envp,ssex
for(;*argv;argv++)
{
check_identifier(*argv) ;
- if (ss_resolve_src_path(&sasrc,*argv,info) < 1) log_dieu(LOG_EXIT_SYS,"resolve source path of: ",*argv) ;
+ if (ss_resolve_src_path(&sasrc,*argv,info->owner) < 1) log_dieu(LOG_EXIT_SYS,"resolve source path of: ",*argv) ;
}
start_parser(&sasrc,info,&nbsv,FORCE) ;
diff --git a/src/lib66/ssexec_help.c b/src/lib66/ssexec_help.c
index 98a3d647fea9120f4558dcf6d9f034e866dea65e..487510c0c0ab5eafe9b98e19adaf1b67bf75c8b9 100644
--- a/src/lib66/ssexec_help.c
+++ b/src/lib66/ssexec_help.c
@@ -14,13 +14,14 @@
#include <66/ssexec.h>
-char const *usage_enable = "66-enable [ -h help ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -f|F ] [ -c|C ] [ -S ] service(s)" ;
+char const *usage_enable = "66-enable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -f|F ] [ -c|C ] [ -S ] service(s)" ;
char const *help_enable =
"66-enable <options> service(s)\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -t: name of the tree to use\n"
@@ -31,13 +32,14 @@ char const *help_enable =
" -S: enable and start the service\n"
;
-char const *usage_dbctl = "66-dbctl [ -h ] [ -v verbosity ] [ -T timeout ] [ -l live ] [ -t tree ] [ -u | d | r ] service(s)" ;
+char const *usage_dbctl = "66-dbctl [ -h ] [ -z ] [ -v verbosity ] [ -T timeout ] [ -l live ] [ -t tree ] [ -u | d | r ] service(s)" ;
char const *help_dbctl =
"66-dbctl <options> tree\n"
"\n"
"options :\n"
" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -T: timeout\n"
" -l: live directory\n"
@@ -47,38 +49,41 @@ char const *help_dbctl =
" -r: reload service\n"
;
-char const *usage_disable = "66-disable [ -h help ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] service(s)" ;
+char const *usage_disable = "66-disable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] service(s)" ;
char const *help_disable =
"66-disable <options> service(s)\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -t: name of the tree to use\n"
" -S: disable and stop the service\n"
;
-char const *usage_init = "66-init [ -h ] [ -v verbosity ] [ -l live ] [ -t tree ] classic|database|both" ;
+char const *usage_init = "66-init [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] classic|database|both" ;
char const *help_init =
"66-init <options> classic|database|both\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -t: name of the tree to use\n"
;
-char const *usage_start = "66-start [ -h ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -r | R ] service(s)" ;
+char const *usage_start = "66-start [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -r | R ] service(s)" ;
char const *help_start =
"66-start <options> service(s)\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -t: tree to use\n"
@@ -87,13 +92,14 @@ char const *help_start =
" -R: reload service(s) file(s) and the service(s) itself\n"
;
-char const *usage_stop = "66-stop [ -h ] [ -v verbosity ] [ -T timeout ] [ -l live ] [ -t tree ] [ -u ] [ -X ] [ -K ] service(s)" ;
+char const *usage_stop = "66-stop [ -h ] [ -z ] [ -v verbosity ] [ -T timeout ] [ -l live ] [ -t tree ] [ -u ] [ -X ] [ -K ] service(s)" ;
char const *help_stop =
"66-stop <options> service(s)\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -T: timeout\n"
@@ -103,13 +109,14 @@ char const *help_stop =
" -K: kill the service(s) and keep it down\n"
;
-char const *usage_svctl = "66-svctl [ -h ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -n death ] [ -u | d | r | K | X ] service(s)" ;
+char const *usage_svctl = "66-svctl [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -n death ] [ -u | d | r | K | X ] service(s)" ;
char const *help_svctl =
"66-svctl <options> tree\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -t: tree to use\n"
@@ -122,13 +129,14 @@ char const *help_svctl =
" -K: kill the service(s) and keep it down\n"
;
-char const *usage_env = "66-env [ -h ] [ -v verbosity ] [ -t tree ] [ -d dir ] [ -L ] [ -e ] [ -r key=value ] service" ;
+char const *usage_env = "66-env [ -h ] [ -z ] [ -v verbosity ] [ -t tree ] [ -d dir ] [ -L ] [ -e ] [ -r key=value ] service" ;
char const *help_env =
"66-env <options> service\n"
"\n"
"options :\n"
-" -h: print this help\n"
+" -h: print this help\n"
+" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -t: tree to use\n"
" -L: list environment variable of service\n"
diff --git a/src/lib66/ssexec_main.c b/src/lib66/ssexec_main.c
index 2bda0ce49b8b7d304f0f4ece8cde5c965e2726bb..f14fd8d940a2637ff346381772ba3ee59b5f8a57 100644
--- a/src/lib66/ssexec_main.c
+++ b/src/lib66/ssexec_main.c
@@ -75,13 +75,15 @@ int ssexec_main(int argc, char const *const *argv,char const *const *envp,ssexec
int n = 0 ;
char const *nargv[argc + 1] ;
+ log_color = &log_color_disable ;
+
nargv[n++] = "fake_name" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
int f = 0 ;
for (;;)
{
- int opt = subgetopt_r(argc,argv, "hv:l:t:T:", &l) ;
+ int opt = subgetopt_r(argc,argv, "hv:l:t:T:z", &l) ;
if (opt == -1) break ;
switch (opt)
@@ -95,6 +97,7 @@ int ssexec_main(int argc, char const *const *argv,char const *const *envp,ssexec
if(!stralloc_0(&info->tree)) log_die_nomem("stralloc") ;
break ;
case 'T' : if (!uint0_scan(l.arg, &info->timeout)) log_usage(info->usage) ; break ;
+ case 'z' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
default : for (int i = 0 ; i < n ; i++)
{
if (!argv[l.ind]) log_usage(info->usage) ;
diff --git a/src/lib66/ssexec_start.c b/src/lib66/ssexec_start.c
index 1a98f9b9ab35618eece0aa12d9900c836717e18a..be6a08242bc462bf8b45b20035b82a0b575cc7da 100644
--- a/src/lib66/ssexec_start.c
+++ b/src/lib66/ssexec_start.c
@@ -13,7 +13,7 @@
*/
#include <string.h>
-#include <stdio.h>
+//#include <stdio.h>
#include <oblibs/obgetopt.h>
#include <oblibs/log.h>
@@ -49,7 +49,8 @@ int svc_sanitize(ssexec_t *info, char const *const *envp)
unsigned int reverse = 0 ;
int r ;
stralloc sares = STRALLOC_ZERO ;
- if (!ss_resolve_pointo(&sares,info,CLASSIC,SS_RESOLVE_SRC))
+
+ if (!ss_resolve_pointo(&sares,info,TYPE_CLASSIC,SS_RESOLVE_SRC))
{
log_warnu("set revolve pointer to source") ;
goto err;
@@ -247,7 +248,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
for (;*argv;argv++)
{
char const *name = *argv ;
- if (!ss_resolve_check(sares.s,name)) log_die(LOG_EXIT_USER,name," is not enabled") ;
+ if (!ss_resolve_check(sares.s,name)) log_info_return(LOG_EXIT_ZERO,name," is not enabled") ;
if (!ss_resolve_read(&res,sares.s,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
if (!ss_resolve_append(&gares,&res)) log_dieusys(LOG_EXIT_SYS,"append services selection with: ",name) ;
}
@@ -284,7 +285,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
if (sta.init){ reload = 0 ; init = 1 ; }
append:
- if (pres->type == CLASSIC)
+ if (pres->type == TYPE_CLASSIC)
{
if (reload)
{
diff --git a/src/lib66/ssexec_stop.c b/src/lib66/ssexec_stop.c
index debcb9ea783dd02f58c8df7469510f54a5b6fe41..5c8786502482ce861d95a322df4004aff953a6a6 100644
--- a/src/lib66/ssexec_stop.c
+++ b/src/lib66/ssexec_stop.c
@@ -157,7 +157,7 @@ int ssexec_stop(int argc, char const *const *argv,char const *const *envp,ssexec
for (;*argv;argv++)
{
char const *name = *argv ;
- if (!ss_resolve_check(sares.s,name)) log_die(LOG_EXIT_USER,name," is not enabled") ;
+ if (!ss_resolve_check(sares.s,name)) log_info_return(LOG_EXIT_ZERO,name," is not enabled") ;
if (!ss_resolve_read(&res,sares.s,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
if (!ss_resolve_append(&gares,&res)) log_dieusys(LOG_EXIT_SYS,"append resolve file of: ",name) ;
}
@@ -189,7 +189,7 @@ int ssexec_stop(int argc, char const *const *argv,char const *const *envp,ssexec
if (UNSUP) unsup = 1 ;
if (sta.unsupervise) unsup = 1 ;
append:
- if (pres->type == CLASSIC)
+ if (pres->type == TYPE_CLASSIC)
{
if (unsup)
{
diff --git a/src/lib66/ssexec_svctl.c b/src/lib66/ssexec_svctl.c
index 4ba9e878e51360da587b233aa453ce3da5d7541f..11bdd0f4eff9aeada7cb9b2fc440bdf9a375f2b7 100644
--- a/src/lib66/ssexec_svctl.c
+++ b/src/lib66/ssexec_svctl.c
@@ -98,7 +98,7 @@ int handle_signal_svc(ss_resolve_sig_t *sv_signal)
else return 0 ;
}
-static unsigned char const actions[9][9] =
+static unsigned char const svctl_actions[9][9] =
{
//signal receive:
// c->u U r/u R/U d D x O s
@@ -170,7 +170,7 @@ int handle_case(stralloc *sa, ss_resolve_sig_t *svc)
for (;i < sa->len ; i++)
{
p = chtenum[(unsigned char)sa->s[i]] ;
- unsigned char action = actions[state][p] ;
+ unsigned char action = svctl_actions[state][p] ;
switch (action)
{
@@ -516,7 +516,7 @@ int ssexec_svctl(int argc, char const *const *argv,char const *const *envp,ssexe
logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
if (!ss_resolve_check(sares.s,name)) log_diesys(LOG_EXIT_SYS,"unknown service: ",name) ;
if (!ss_resolve_read(&res,sares.s,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
- if (res.type >= BUNDLE) log_die(LOG_EXIT_SYS,name," has type ",get_keybyid(res.type)) ;
+ if (res.type >= TYPE_BUNDLE) log_die(LOG_EXIT_SYS,name," has type ",get_key_by_enum(ENUM_TYPE,res.type)) ;
if (SIGNAL == SIGR && logname < 0) reverse = 1 ;
if (!ss_resolve_graph_build(&graph,&res,sares.s,reverse)) log_dieusys(LOG_EXIT_SYS,"build services graph") ;
}
diff --git a/src/lib66/svc_switch_to.c b/src/lib66/svc_switch_to.c
index 16aef26940aa4d8a0ec3a7c6ece1e4adbbfeb41c..d953295e46cc990f27e97f2c4a48fb1be0010ee0 100644
--- a/src/lib66/svc_switch_to.c
+++ b/src/lib66/svc_switch_to.c
@@ -31,7 +31,7 @@ int svc_switch_to(ssexec_t *info,unsigned int where)
int r ;
char type[UINT_FMT] ;
- size_t typelen = uint_fmt(type, CLASSIC) ;
+ size_t typelen = uint_fmt(type, TYPE_CLASSIC) ;
type[typelen] = 0 ;
size_t cmdlen ;
char cmd[typelen + 6 + 1] ;
@@ -49,7 +49,7 @@ int svc_switch_to(ssexec_t *info,unsigned int where)
if (!r && where)
{
log_trace("make a backup of svc service for: ",info->treename.s) ;
- if (!backup_make_new(info,CLASSIC))
+ if (!backup_make_new(info,TYPE_CLASSIC))
log_warnusys_return(LOG_EXIT_ZERO,"make a backup of svc service for: ",info->treename.s) ;
log_trace("switch svc symlink of tree: ",info->treename.s," to backup") ;
@@ -73,7 +73,7 @@ int svc_switch_to(ssexec_t *info,unsigned int where)
}
log_trace("make a backup of svc service for: ",info->treename.s) ;
- if (!backup_make_new(info,CLASSIC))
+ if (!backup_make_new(info,TYPE_CLASSIC))
log_warnusys_return(LOG_EXIT_ZERO,"make a backup of svc service for: ",info->treename.s) ;
}
return 1 ;
diff --git a/src/lib66/tree_copy_tmp.c b/src/lib66/tree_copy_tmp.c
index 1a0248634b0be2cbd44109161158b1e412463a67..780fb24754562c46662fe129d89fdb0a18587921 100644
--- a/src/lib66/tree_copy_tmp.c
+++ b/src/lib66/tree_copy_tmp.c
@@ -65,12 +65,12 @@ int tree_copy_tmp(char const *workdir, ssexec_t *info)
/** svc */
if (rm_rf(svdir) < 0)
{
- if (!ss_resolve_pointo(&saresolve,info,CLASSIC,SS_RESOLVE_SRC))
+ if (!ss_resolve_pointo(&saresolve,info,TYPE_CLASSIC,SS_RESOLVE_SRC))
{
err(&e,0,saresolve.s,swap.s,svdir) ;
goto err ;
}
- if (!ss_resolve_pointo(&swap,info,CLASSIC,SS_RESOLVE_BACK))
+ if (!ss_resolve_pointo(&swap,info,TYPE_CLASSIC,SS_RESOLVE_BACK))
{
err(&e,1,saresolve.s,swap.s,svdir) ;
goto err ;
@@ -89,12 +89,12 @@ int tree_copy_tmp(char const *workdir, ssexec_t *info)
svdir[svdirlen + SS_DB_LEN] = 0 ;
if (rm_rf(svdir) < 0)
{
- if (!ss_resolve_pointo(&saresolve,info,LONGRUN,SS_RESOLVE_SRC))
+ if (!ss_resolve_pointo(&saresolve,info,TYPE_LONGRUN,SS_RESOLVE_SRC))
{
err(&e,0,saresolve.s,swap.s,svdir) ;
goto err ;
}
- if (!ss_resolve_pointo(&swap,info,LONGRUN,SS_RESOLVE_BACK))
+ if (!ss_resolve_pointo(&swap,info,TYPE_LONGRUN,SS_RESOLVE_BACK))
{
err(&e,1,saresolve.s,swap.s,svdir) ;
goto err ;