From 5b699a208473a51759e2b3fec11caaaf042fa9af Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Thu, 28 Feb 2019 16:32:12 +1100
Subject: [PATCH] 66-all regress to the previous state
---
src/66/66-all.c | 350 +++++++++++++++++++++++++++++++++++++++-
src/include/66/ssexec.h | 3 -
src/lib66/deps-lib/66 | 1 -
src/lib66/ssexec_all.c | 330 -------------------------------------
src/lib66/ssexec_help.c | 22 +--
5 files changed, 345 insertions(+), 361 deletions(-)
delete mode 100644 src/lib66/ssexec_all.c
diff --git a/src/66/66-all.c b/src/66/66-all.c
index 23d2dd8b..f49eddbd 100644
--- a/src/66/66-all.c
+++ b/src/66/66-all.c
@@ -12,23 +12,357 @@
* except according to the terms contained in the LICENSE file./
*/
-#include <skalibs/strerr2.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
-#include <66/ssexec.h>
+#include <oblibs/error2.h>
+#include <oblibs/obgetopt.h>
+#include <oblibs/stralist.h>
+#include <oblibs/types.h>
+#include <oblibs/string.h>
+#include <oblibs/files.h>
+#include <oblibs/directory.h>
+
+#include <skalibs/buffer.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+#include <skalibs/types.h>
+#include <skalibs/djbunix.h>
+#include <skalibs/direntry.h>
+#include <skalibs/tai.h>
+#include <skalibs/unix-transactional.h>
+#include <skalibs/selfpipe.h>
+#include <skalibs/sig.h>
+
+#include <66/constants.h>
+#include <66/config.h>
+#include <66/utils.h>
+#include <66/tree.h>
+
+#include <s6/s6-supervise.h>
+#include <s6/config.h>
+
+#include <stdio.h>
unsigned int VERBOSITY = 1 ;
+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"
+
+static inline void info_help (void)
+{
+ static char const *help =
+"66-all <options> up/down\n"
+"\n"
+"options :\n"
+" -h: print this help\n"
+" -v: increase/decrease verbosity\n"
+" -T: timeout\n"
+" -l: live directory\n"
+" -t: tree to use\n"
+" -f: fork the process\n"
+;
+
+ if (buffer_putsflush(buffer_1, help) < 0)
+ strerr_diefu1sys(111, "write to stdout") ;
+}
+
+
+int doit(char const *tree,char const *treename,char const *live, unsigned int what, char const *const *envp)
+{
+ int wstat ;
+ pid_t pid ;
+ size_t treelen = strlen(tree) ;
+ genalloc ga = GENALLOC_ZERO ; //stralist
+
+ char src[treelen + SS_SVDIRS_LEN + SS_SVC_LEN + 1] ;
+ memcpy(src,tree,treelen) ;
+ memcpy(src + treelen, SS_SVDIRS,SS_SVDIRS_LEN) ;
+ memcpy(src + treelen +SS_SVDIRS_LEN, SS_SVC,SS_SVC_LEN) ;
+ src[treelen +SS_SVDIRS_LEN + SS_SVC_LEN] = 0 ;
+
+ if (!dir_get(&ga,src,"",S_IFDIR))
+ {
+ VERBO3 strerr_warnwu2x("find source of classic service for tree: ",treename) ;
+ return 0 ;
+ }
+ if (!genalloc_len(stralist,&ga))
+ {
+ VERBO3 strerr_warni4x("no classic service for tree: ",treename," to ", what ? "start" : "stop") ;
+ }
+ /** add transparent Master to start the db*/
+ if (!stra_add(&ga,"Master"))
+ {
+ VERBO3 strerr_warnwu2x("add Master as service to ", what ? "start" : "stop") ;
+ return 0 ;
+ }
+
+
+ char const *newargv[10 + genalloc_len(stralist,&ga)] ;
+ unsigned int m = 0 ;
+ char fmt[UINT_FMT] ;
+ fmt[uint_fmt(fmt, VERBOSITY)] = 0 ;
+
+ char tt[UINT32_FMT] ;
+ tt[uint32_fmt(tt,DEADLINE)] = 0 ;
+
+ if (what)
+ newargv[m++] = SS_BINPREFIX "66-start" ;
+ else
+ newargv[m++] = SS_BINPREFIX "66-stop" ;
+ newargv[m++] = "-v" ;
+ newargv[m++] = fmt ;
+ newargv[m++] = "-T" ;
+ newargv[m++] = tt ;
+ newargv[m++] = "-l" ;
+ newargv[m++] = live ;
+ newargv[m++] = "-t" ;
+ newargv[m++] = treename ;
+
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&ga) ; i++)
+ newargv[m++] = gaistr(&ga,i) ;
+
+ newargv[m++] = 0 ;
+
+ pid = child_spawn0(newargv[0],newargv,envp) ;
+ if (waitpid_nointr(pid,&wstat, 0) < 0)
+ {
+ VERBO3 strerr_warnwu2sys("wait for ",newargv[0]) ;
+ return 0 ;
+ }
+ if (wstat) return 0 ;
+
+ return 1 ;
+}
+
+static void redir_fd(void)
+{
+ int fd ;
+ while((fd = open("/dev/tty",O_RDWR|O_NOCTTY)) >= 0)
+ {
+ if (fd >= 3) break ;
+ }
+ dup2 (fd,0) ;
+ dup2 (fd,1) ;
+ dup2 (fd,2) ;
+ fd_close(fd) ;
+
+ if (setsid() < 0) strerr_diefu1sys(111,"setsid") ;
+ if ((chdir("/")) < 0) strerr_diefu1sys(111,"chdir") ;
+ ioctl(0,TIOCSCTTY,1) ;
+
+ umask(022) ;
+}
+
int main(int argc, char const *const *argv,char const *const *envp)
{
+ int r ;
+ int what ;
+ int wstat ;
+ int shut = 0 ;
+ pid_t pid ;
+ uid_t owner ;
+ int fd ;
+
+ char const *treename = NULL ;
+
+ stralloc base = STRALLOC_ZERO ;
+ stralloc scandir = STRALLOC_ZERO ;
+ stralloc livetree = STRALLOC_ZERO ;
+ stralloc tree = STRALLOC_ZERO ;
+ stralloc live = STRALLOC_ZERO ;
+ stralloc contents = STRALLOC_ZERO ;
+ genalloc in = GENALLOC_ZERO ; //stralist
+
+ what = 1 ;
+
PROG = "66-all" ;
+ {
+ subgetopt_t l = SUBGETOPT_ZERO ;
+
+ for (;;)
+ {
+ int opt = getopt_args(argc,argv, ">hv:l:T:t:f", &l) ;
+ if (opt == -1) break ;
+ if (opt == -2) strerr_dief1x(110,"options must be set first") ;
+ switch (opt)
+ {
+ case 'h' : info_help(); return 0 ;
+ case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) exitusage(USAGE) ; break ;
+ case 'l' : if (!stralloc_cats(&live,l.arg)) retstralloc(111,"main") ;
+ if (!stralloc_0(&live)) retstralloc(111,"main") ;
+ break ;
+ case 'T' : if (!uint0_scan(l.arg, &DEADLINE)) exitusage(USAGE) ; break ;
+ case 't' : treename = l.arg ; break ;
+ case 'f' : shut = 1 ; break ;
+ default : exitusage(USAGE) ;
+ }
+ }
+ argc -= l.ind ; argv += l.ind ;
+ }
+
+ if (argc != 1) exitusage(USAGE) ;
- ssexec_t info = SSEXEC_ZERO ;
+ if (*argv[0] == 'u') what = 1 ;
+ else if (*argv[0] == 'd') what = 0 ;
+ else exitusage(USAGE) ;
- info.prog = PROG ;
- info.help = help_all ;
- info.usage = usage_all ;
+ owner = MYUID ;
+
+ if (!set_ownersysdir(&base,owner)) strerr_diefu1sys(111, "set owner directory") ;
- return ssexec_main(argc,argv,envp,&ssexec_all,&info) ;
-}
+ r = set_livedir(&live) ;
+ if (!r) retstralloc(111,"main") ;
+ if (r < 0 ) strerr_dief3x(111,"live: ",live.s," must be an absolute path") ;
+
+ if (!stralloc_copy(&scandir,&live)) retstralloc(111,"main") ;
+
+ r = set_livescan(&scandir,owner) ;
+ if (!r) retstralloc(111,"main") ;
+ if (r < 0 ) strerr_dief3x(111,"scandir: ",scandir.s," must be an absolute path") ;
+
+ if ((scandir_ok(scandir.s)) !=1 ) strerr_dief3sys(111,"scandir: ", scandir.s," is not running") ;
+
+ if (!stralloc_copy(&livetree,&live)) retstralloc(111,"main") ;
+ r = set_livetree(&livetree,owner) ;
+ if (!r) retstralloc(111,"main") ;
+ if (r < 0 ) strerr_dief3x(111,"livetree: ",livetree.s," must be an absolute path") ;
+
+ size_t statesize ;
+ /** /system/state */
+ size_t statelen ;
+ char state[base.len + SS_SYSTEM_LEN + SS_STATE_LEN + 1] ;
+ memcpy(state,base.s,base.len) ;
+ memcpy(state + base.len,SS_SYSTEM,SS_SYSTEM_LEN) ;
+ memcpy(state + base.len + SS_SYSTEM_LEN, SS_STATE ,SS_STATE_LEN) ;
+ statelen = base.len + SS_SYSTEM_LEN + SS_STATE_LEN ;
+ state[statelen] = 0 ;
+
+ r = scan_mode(state,S_IFREG) ;
+ if (r < 0) { errno = EEXIST ; return -1 ; }
+ if (!r) strerr_diefu2sys(111,"find: ",state) ;
+
+ statesize = file_get_size(state) ;
+
+ r = openreadfileclose(state,&contents,statesize) ;
+ if(!r) strerr_diefu2sys(111,"open: ", state) ;
+
+ /** ensure that we have an empty line at the end of the string*/
+ if (!stralloc_cats(&contents,"\n")) retstralloc(111,"main") ;
+ if (!stralloc_0(&contents)) retstralloc(111,"main") ;
+
+ /** only one tree?*/
+ if (treename)
+ {
+ if (!stra_add(&in,treename)) strerr_diefu3x(111,"add: ", treename," as tree to start") ;
+ }
+ else
+ {
+ if (!clean_val(&in,contents.s))
+ strerr_diefu2x(111,"clean: ",contents.s) ;
+ }
+ if (!in.len)
+ {
+ strerr_warni1x("nothing to do") ;
+ return 0 ;
+ }
+
+ if (shut)
+ {
+ pid_t dpid ;
+ int wstat = 0 ;
+
+ dpid = fork() ;
+
+ if (dpid < 0) strerr_diefu1sys(111,"fork") ;
+ else if (dpid > 0)
+ {
+ if (waitpid_nointr(dpid,&wstat, 0) < 0)
+ strerr_diefu1sys(111,"wait for child") ;
+
+ if (wstat)
+ strerr_dief1x(111,"child fail") ;
+
+ goto end ;
+
+ }
+ else redir_fd() ;
+ }
+
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&in) ; i++)
+ {
+ tree = stralloc_zero ;
+
+ char *treename = gaistr(&in,i) ;
+
+ if(!stralloc_cats(&tree,treename)) retstralloc(111,"main") ;
+ if(!stralloc_0(&tree)) retstralloc(111,"main") ;
+
+ r = tree_sethome(&tree,base.s,owner) ;
+ if (r < 0 || !r) strerr_diefu2sys(111,"find tree: ", tree.s) ;
+
+ if (!tree_get_permissions(tree.s,owner))
+ strerr_dief2x(110,"You're not allowed to use the tree: ",tree.s) ;
+
+ if (what)
+ {
+ char const *newargv[9] ;
+ unsigned int m = 0 ;
+ char fmt[UINT_FMT] ;
+ fmt[uint_fmt(fmt, VERBOSITY)] = 0 ;
+
+ newargv[m++] = SS_BINPREFIX "66-init" ;
+ newargv[m++] = "-v" ;
+ newargv[m++] = fmt ;
+ newargv[m++] = "-l" ;
+ newargv[m++] = live.s ;
+ newargv[m++] = "-t" ;
+ newargv[m++] = treename ;
+ newargv[m++] = "b" ;
+ newargv[m++] = 0 ;
+
+ pid = child_spawn0(newargv[0],newargv,envp) ;
+ if (waitpid_nointr(pid,&wstat, 0) < 0)
+ strerr_diefu2sys(111,"wait for ",newargv[0]) ;
+
+ if (wstat)
+ strerr_diefu2x(111,"initiate services of tree: ",treename) ;
+
+ VERBO3 strerr_warnt2x("reload scandir: ",scandir.s) ;
+ r = s6_svc_writectl(scandir.s, S6_SVSCAN_CTLDIR, "an", 2) ;
+ if (r < 0)
+ {
+ VERBO3 strerr_warnw3sys("something is wrong with the ",scandir.s, "/" S6_SVSCAN_CTLDIR " directory. errno reported") ;
+ return -1 ;
+ }
+ }
+
+ if (!doit(tree.s,treename,live.s,what,envp)) strerr_warnwu3x((what) ? "start" : "stop" , " service for tree: ",treename) ;
+ }
+ end:
+ if (shut)
+ {
+ while((fd = open("/dev/tty",O_RDWR|O_NOCTTY)) >= 0)
+ {
+ if (fd >= 3) break ;
+ }
+ dup2 (fd,0) ;
+ dup2 (fd,1) ;
+ dup2 (fd,2) ;
+ fd_close(fd) ;
+ }
+ stralloc_free(&base) ;
+ stralloc_free(&live) ;
+ stralloc_free(&tree) ;
+ stralloc_free(&livetree) ;
+ stralloc_free(&scandir) ;
+ stralloc_free(&contents) ;
+ genalloc_deepfree(stralist,&in,stra_free) ;
+
+ return 0 ;
+}
diff --git a/src/include/66/ssexec.h b/src/include/66/ssexec.h
index a43a024b..541761bb 100644
--- a/src/include/66/ssexec.h
+++ b/src/include/66/ssexec.h
@@ -56,7 +56,6 @@ extern ssexec_t const ssexec_zero ;
extern int set_ssinfo(ssexec_t *info) ;
extern ssexec_func_t ssexec_init ;
-extern ssexec_func_t ssexec_all ;
extern ssexec_func_t ssexec_enable ;
extern ssexec_func_t ssexec_disable ;
extern ssexec_func_t ssexec_start ;
@@ -78,8 +77,6 @@ extern char const *usage_stop ;
extern char const *help_stop ;
extern char const *usage_init ;
extern char const *help_init ;
-extern char const *usage_all ;
-extern char const *help_all ;
extern int ssexec_main(int argc, char const *const *argv, char const *const *envp,ssexec_func_t *func,ssexec_t *info) ;
diff --git a/src/lib66/deps-lib/66 b/src/lib66/deps-lib/66
index 1daa7ded..a9e31498 100644
--- a/src/lib66/deps-lib/66
+++ b/src/lib66/deps-lib/66
@@ -26,7 +26,6 @@ set_livescan.o
set_livetree.o
set_ownerhome.o
set_ownersysdir.o
-ssexec_all.o
ssexec_dbctl.o
ssexec_enable.o
ssexec_disable.o
diff --git a/src/lib66/ssexec_all.c b/src/lib66/ssexec_all.c
deleted file mode 100644
index 7ea1d1fd..00000000
--- a/src/lib66/ssexec_all.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * ssexec_all.c
- *
- * Copyright (c) 2018 Eric Vidal <eric@obarun.org>
- *
- * All rights reserved.
- *
- * This file is part of Obarun. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution.
- * This file may not be copied, modified, propagated, or distributed
- * except according to the terms contained in the LICENSE file./
- */
-
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-#include <oblibs/error2.h>
-#include <oblibs/obgetopt.h>
-#include <oblibs/stralist.h>
-#include <oblibs/types.h>
-#include <oblibs/string.h>
-#include <oblibs/files.h>
-#include <oblibs/directory.h>
-
-#include <skalibs/buffer.h>
-#include <skalibs/stralloc.h>
-#include <skalibs/genalloc.h>
-#include <skalibs/types.h>
-#include <skalibs/djbunix.h>
-#include <skalibs/direntry.h>
-#include <skalibs/tai.h>
-#include <skalibs/unix-transactional.h>
-#include <skalibs/selfpipe.h>
-#include <skalibs/sig.h>
-
-#include <66/constants.h>
-#include <66/config.h>
-#include <66/utils.h>
-#include <66/tree.h>
-#include <66/ssexec.h>
-#include <66/graph.h>
-
-#include <s6/s6-supervise.h>
-#include <s6/config.h>
-
-
-#include <stdio.h>
-
-static unsigned int DEADLINE = 0 ;
-
-int doit(ssexec_t *info, unsigned int what, char const *const *envp)
-{
- genalloc ga = GENALLOC_ZERO ; //stralist
-
- char src[info->tree.len + SS_SVDIRS_LEN + SS_SVC_LEN + 1] ;
- memcpy(src,info->tree.s,info->tree.len) ;
- memcpy(src + info->tree.len, SS_SVDIRS,SS_SVDIRS_LEN) ;
- src[info->tree.len + SS_SVDIRS_LEN] = 0 ;
-
-/* graph_t g = GRAPH_ZERO ;
- stralloc sagraph = STRALLOC_ZERO ;
- genalloc tokeep = GENALLOC_ZERO ;
- int r ;
- // build dependencies graph
- r = graph_type_src(&tokeep,src,1) ;
- if (r <= 0)
- {
- strerr_warnwu2x("resolve source of graph for tree: ",src) ;
- return 0 ;
- }
- if (!graph_build(&g,&sagraph,&tokeep,src))
- {
- strerr_warnwu1x("make dependencies graph") ;
- return 0 ;
- }
-
- r = graph_rdepends(&ga,&g,"Master",src) ;
- if (!r)
- {
- strerr_warnwu2x("find services depending for: ","Master") ;
- return 0 ;
- }
- graph_free(&g) ;
- stralloc_free(&sagraph) ;
- genalloc_deepfree(stralist,&tokeep,stra_free) ;*/
- memcpy(src + info->tree.len + SS_SVDIRS_LEN, SS_SVC,SS_SVC_LEN) ;
- src[info->tree.len + SS_SVDIRS_LEN + SS_SVC_LEN] = 0 ;
-
- if (!dir_get(&ga,src,"",S_IFDIR))
- {
- VERBO3 strerr_warnwu2x("find source of classic service for tree: ",info->treename.s) ;
- return 0 ;
- }
- if (!genalloc_len(stralist,&ga))
- {
- VERBO3 strerr_warni4x("no classic service for tree: ",info->treename.s," to ", what ? "start" : "stop") ;
- }
-
- if (!stra_add(&ga,"Master"))
- {
- VERBO3 strerr_warnwu2x("add Master as service to ", what ? "start" : "stop") ;
- return 0 ;
- }
-
- int nargc = 2 + genalloc_len(stralist,&ga) ;
- char const *newargv[nargc] ;
- unsigned int m = 0 ;
-
- newargv[m++] = "fake_name" ;
-
- for (unsigned int i = 0 ; i < genalloc_len(stralist,&ga) ; i++)
- newargv[m++] = gaistr(&ga,i) ;
-
- newargv[m++] = 0 ;
-
- if (what)
- {
- if (ssexec_start(nargc,newargv,envp,info))
- {
- genalloc_deepfree(stralist,&ga,stra_free) ;
- return 0 ;
- }
- }
- else
- if (ssexec_stop(nargc,newargv,envp,info))
- {
- genalloc_deepfree(stralist,&ga,stra_free) ;
- return 0 ;
- }
-
- genalloc_deepfree(stralist,&ga,stra_free) ;
- return 1 ;
-}
-
-static void redir_fd(void)
-{
- int fd ;
- while((fd = open("/dev/tty",O_RDWR|O_NOCTTY)) >= 0)
- {
- if (fd >= 3) break ;
- }
- dup2 (fd,0) ;
- dup2 (fd,1) ;
- dup2 (fd,2) ;
- fd_close(fd) ;
-
- if (setsid() < 0) strerr_diefu1sys(111,"setsid") ;
- if ((chdir("/")) < 0) strerr_diefu1sys(111,"chdir") ;
- ioctl(0,TIOCSCTTY,1) ;
-
- umask(022) ;
-}
-
-int ssexec_all(int argc, char const *const *argv,char const *const *envp,ssexec_t *info)
-{
-
- // be sure that the global var are set correctly
- DEADLINE = 0 ;
-
- int r ;
- int what ;
- int shut = 0 ;
- int fd ;
- int intree = 0 ;
-
- stralloc contents = STRALLOC_ZERO ;
- genalloc in = GENALLOC_ZERO ; //stralist
-
- what = 1 ;
-
- {
- subgetopt_t l = SUBGETOPT_ZERO ;
-
- for (;;)
- {
- int opt = getopt_args(argc,argv, ">o:f", &l) ;
- if (opt == -1) break ;
- if (opt == -2) strerr_dief1x(110,"options must be set first") ;
- switch (opt)
- {
- case 'o' : if (!stralloc_obreplace(&info->treename,l.arg))
- strerr_diefu1sys(111,"keep treename") ;
- intree = 1 ; break ;
- case 'f' : shut = 1 ; break ;
- default : exitusage(usage_all) ;
- }
- }
- argc -= l.ind ; argv += l.ind ;
- }
-
- if (argc != 1) exitusage(usage_all) ;
-
- if (*argv[0] == 'u') what = 1 ;
- else if (*argv[0] == 'd') what = 0 ;
- else exitusage(usage_all) ;
-
- if ((scandir_ok(info->scandir.s)) !=1 ) strerr_dief3sys(111,"scandir: ",info->scandir.s," is not running") ;
-
- size_t statesize ;
- /** /system/state */
- size_t statelen ;
- char state[info->base.len + SS_SYSTEM_LEN + SS_STATE_LEN + 1] ;
- memcpy(state,info->base.s,info->base.len) ;
- memcpy(state + info->base.len,SS_SYSTEM,SS_SYSTEM_LEN) ;
- memcpy(state + info->base.len + SS_SYSTEM_LEN, SS_STATE ,SS_STATE_LEN) ;
- statelen = info->base.len + SS_SYSTEM_LEN + SS_STATE_LEN ;
- state[statelen] = 0 ;
-
- r = scan_mode(state,S_IFREG) ;
- if (r < 0) { errno = EEXIST ; return -1 ; }
- if (!r) strerr_diefu2sys(111,"find: ",state) ;
-
- statesize = file_get_size(state) ;
-
- r = openreadfileclose(state,&contents,statesize) ;
- if(!r) strerr_diefu2sys(111,"open: ", state) ;
-
- /** ensure that we have an empty line at the end of the string*/
- if (!stralloc_cats(&contents,"\n")) retstralloc(111,"main") ;
- if (!stralloc_0(&contents)) retstralloc(111,"main") ;
-
- /** only one tree?*/
- if (intree)
- {
- if (!stra_add(&in,info->treename.s)) strerr_diefu3x(111,"add: ", info->treename.s," as tree to start") ;
- }
- else
- {
- if (!clean_val(&in,contents.s))
- strerr_diefu2x(111,"clean: ",contents.s) ;
- }
-
- if (!in.len)
- {
- strerr_warni1x("nothing to do") ;
- goto freed ;
- }
-
- if (shut)
- {
- pid_t dpid ;
- int wstat = 0 ;
-
- dpid = fork() ;
-
- if (dpid < 0) strerr_diefu1sys(111,"fork") ;
- else if (dpid > 0)
- {
- if (waitpid_nointr(dpid,&wstat, 0) < 0)
- strerr_diefu1sys(111,"wait for child") ;
-
- if (wstat)
- strerr_dief1x(111,"child fail") ;
-
- goto end ;
-
- }
- else redir_fd() ;
- }
-
- for (unsigned int i = 0 ; i < genalloc_len(stralist,&in) ; i++)
- {
- stralloc tree = STRALLOC_ZERO ;
-
- char *treename = gaistr(&in,i) ;
-
- if(!stralloc_cats(&tree,treename)) retstralloc(111,"main") ;
- if(!stralloc_0(&tree)) retstralloc(111,"main") ;
-
- r = tree_sethome(&tree,info->base.s,info->owner) ;
- if (r < 0 || !r) strerr_diefu2sys(111,"find tree: ", tree.s) ;
-
- if (!stralloc_obreplace(&info->tree,tree.s)) strerr_diefu1sys(111,"replace info->tree string") ;
-
- stralloc_free(&tree) ;
-
- if (!tree_get_permissions(info->tree.s,info->owner))
- strerr_dief2x(110,"You're not allowed to use the tree: ",info->tree.s) ;
-
- if (!stralloc_obreplace(&info->treename,treename)) strerr_diefu1sys(111,"replace info->treename string") ;
- info->tree.len--;
- info->treename.len--;
-
- if (what)
- {
- int nargc = 4 ;
- char const *newargv[nargc] ;
- unsigned int m = 0 ;
-
- newargv[m++] = "fake_name" ;
- newargv[m++] = "-B" ;
- newargv[m++] = info->treename.s ;
- newargv[m++] = 0 ;
-
- if (ssexec_init(nargc,newargv,envp,info))
- strerr_diefu2x(111,"initiate services of tree: ",treename) ;
-
- r = s6_svc_writectl(info->scandir.s, S6_SVSCAN_CTLDIR, "an", 2) ;
- if (r < 0) strerr_dief3sys(111,"something is wrong with the ",info->scandir.s, "/" S6_SVSCAN_CTLDIR " directory. errno reported") ;
-
- }
-
- if (!doit(info,what,envp)) strerr_warnwu3x((what) ? "start" : "stop" , " service for tree: ",treename) ;
-
- }
- end:
- if (shut)
- {
- while((fd = open("/dev/tty",O_RDWR|O_NOCTTY)) >= 0)
- {
- if (fd >= 3) break ;
- }
- dup2 (fd,0) ;
- dup2 (fd,1) ;
- dup2 (fd,2) ;
- fd_close(fd) ;
- }
-
- freed:
- stralloc_free(&contents) ;
- genalloc_deepfree(stralist,&in,stra_free) ;
-
- return 0 ;
-}
-
-
-
diff --git a/src/lib66/ssexec_help.c b/src/lib66/ssexec_help.c
index df700180..6047f420 100644
--- a/src/lib66/ssexec_help.c
+++ b/src/lib66/ssexec_help.c
@@ -57,18 +57,16 @@ char const *help_disable =
" -S: disable and stop the service\n"
;
-char const *usage_init = "66-init [ -h ] [ -v verbosity ] [ -l live ] [ -c | d | B ] tree" ;
+char const *usage_init = "66-init [ -h ] [ -v verbosity ] [ -l live ] [ -t tree ] classic|database|both" ;
char const *help_init =
-"66-init <options> tree\n"
+"66-init <options> classic|database|both\n"
"\n"
"options :\n"
" -h: print this help\n"
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
-" -c: init classic service\n"
-" -d: init database service\n"
-" -B: init classic and database service\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)" ;
@@ -123,17 +121,3 @@ char const *help_svctl =
" -X: bring down the service(s) and the kill his supervisor\n"
" -K: kill the service(s) and keep it down\n"
;
-
-char const *usage_all = "66-all [ -h ] [ -v verbosity ] [ -f ] [ -T timeout ] [ -l live ] [ -o tree ] up/down" ;
-
-char const *help_all =
-"66-all <options> up/down\n"
-"\n"
-"options :\n"
-" -h: print this help\n"
-" -v: increase/decrease verbosity\n"
-" -T: timeout\n"
-" -l: live directory\n"
-" -o: tree to use\n"
-" -f: fork the process\n"
-;
--
GitLab