diff --git a/package/deps.mak b/package/deps.mak
index 7c42587d3fbe735c17e809b66c8653d8eea8f203..1e43477b3409e7d7a6c7641e161ea79b5f005aae 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -9,6 +9,7 @@ src/66/66-all.o src/66/66-all.lo: src/66/66-all.c src/include/66/config.h src/in
src/66/66-dbctl.o src/66/66-dbctl.lo: src/66/66-dbctl.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/66/66-disable.o src/66/66-disable.lo: src/66/66-disable.c src/include/66/backup.h 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/66/66-enable.o src/66/66-enable.lo: src/66/66-enable.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/parser.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
+src/66/66-info.o src/66/66-info.lo: src/66/66-info.c src/include/66/constants.h src/include/66/enum.h src/include/66/tree.h src/include/66/utils.h
src/66/66-init.o src/66/66-init.lo: src/66/66-init.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/tree.h src/include/66/utils.h
src/66/66-scandir.o src/66/66-scandir.lo: src/66/66-scandir.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
src/66/66-start.o src/66/66-start.lo: src/66/66-start.c src/include/66/backup.h src/include/66/config.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
@@ -64,6 +65,8 @@ src/lib66/tree_switch_tobackup.o src/lib66/tree_switch_tobackup.lo: src/lib66/tr
66-disable: src/66/66-disable.o ${LIB66} -loblibs -lskarnet
66-enable: EXTRA_LIBS :=
66-enable: src/66/66-enable.o ${LIB66} -loblibs -lskarnet -lexecline -ls6
+66-info: EXTRA_LIBS :=
+66-info: src/66/66-info.o ${LIB66} -loblibs -ls6 -lskarnet
66-init: EXTRA_LIBS :=
66-init: src/66/66-init.o ${LIB66} -loblibs -ls6 -lskarnet
66-scandir: EXTRA_LIBS :=
diff --git a/package/modes b/package/modes
index 63252212f4b74caae2c0bd876425afd71289260b..89f1f624ea4961bd6d9dec29eb4b21416dddbaf4 100644
--- a/package/modes
+++ b/package/modes
@@ -8,4 +8,5 @@
66-stop 0755
66-svctl 0755
66-all 0755
+66-info 0755
execl-cmdline 0755
diff --git a/package/targets.mak b/package/targets.mak
index 2a7bbacba32d038d18bae4705fd3dd65797cdf63..fbe986d76de530e289334e736d776312065f822e 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -9,6 +9,7 @@ BIN_TARGETS := \
66-stop \
66-svctl \
66-all \
+66-info \
execl-cmdline
LIB_DEFS := 66=66
diff --git a/src/66/66-enable.c b/src/66/66-enable.c
index 256a20a37d02e1e79f283e7253dc63ef383297d5..2a01d0bb32a465d8f6db095d77f4d5b89957a0fa 100644
--- a/src/66/66-enable.c
+++ b/src/66/66-enable.c
@@ -289,7 +289,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
strerr_diefu3x(111,"switch ",treename," to backup") ;
}
}
-
+
stralloc swap = stralloc_zero ;
size_t svdirlen ;
char svdir[tree.len + SS_SVDIRS_LEN + SS_RESOLVE_LEN + 1] ;
diff --git a/src/66/66-info.c b/src/66/66-info.c
new file mode 100644
index 0000000000000000000000000000000000000000..3451dad9949c07d241210d622abdd3e4d60a7027
--- /dev/null
+++ b/src/66/66-info.c
@@ -0,0 +1,605 @@
+/*
+ * 66-info.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 <locale.h>
+#include <langinfo.h>
+
+#include <oblibs/obgetopt.h>
+#include <oblibs/error2.h>
+#include <oblibs/stralist.h>
+#include <oblibs/string.h>
+#include <oblibs/files.h>
+
+#include <skalibs/buffer.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/unix-transactional.h>
+#include <skalibs/direntry.h>
+#include <skalibs/types.h>
+#include <skalibs/bytestr.h>
+#include <skalibs/lolstdio.h>
+#include <skalibs/djbunix.h>
+
+#include <66/utils.h>
+#include <66/tree.h>
+#include <66/constants.h>
+#include <66/enum.h>
+
+#include <s6/s6-supervise.h>//s6_svc_ok
+
+#include <stdio.h>
+unsigned int VERBOSITY = 1 ;
+static stralloc base = STRALLOC_ZERO ;
+static stralloc live = STRALLOC_ZERO ;
+static stralloc saresolve = STRALLOC_ZERO ;
+static stralloc SCANDIR = STRALLOC_ZERO ; // upper case to avoid conflicts with dirent.h
+static uid_t owner ;
+
+#define MAXSIZE 4096
+#define DBG(...) bprintf(buffer_1, __VA_ARGS__) ;\
+ buffer_putflush(buffer_1,"\n",1) ;
+
+
+#define USAGE "66-info [ -h help ] [ -T tree ] [ -S service ] sub-options (use -h as sub-options for futher informations)"
+#define TREE_USAGE "66-info -T [ -help ] [ -L list] [ -t tree ]"
+#define exit_tree_usage() strerr_dieusage(100, TREE_USAGE)
+#define SV_USAGE "66-info -S [ -help ] [ -t tree ] [ -l live ] [ -p n lines ] service"
+#define exit_sv_usage() strerr_dieusage(100, SV_USAGE)
+
+/*
+struct graph_style {
+ const char *tip;
+ const char *last;
+ const char *limb;
+ int indent;
+};
+
+#define UTF_V "\342\224\202" // U+2502, Vertical line drawing char
+#define UTF_VR "\342\224\234" // U+251C, Vertical and right
+#define UTF_H "\342\224\200" // U+2500, Horizontal
+#define UTF_UR "\342\224\224" // U+2514, Up and right
+
+static struct graph_style graph_utf8 = {
+ UTF_VR UTF_H,
+ UTF_UR UTF_H,
+ UTF_V " ",
+ 2
+};
+
+static struct graph_style graph_default = {
+ "|-",
+ "`-",
+ "|",
+ 2
+};
+
+static struct graph_style *style = &graph_default;
+*/
+
+static inline void info_help (void)
+{
+ static char const *help =
+"66-info <options> sub-options \n"
+"\n"
+"options :\n"
+" -h: print this help\n"
+" -T: get informations about tree(s)\n"
+" -S: get informations about service(s)\n"
+;
+
+ if (buffer_putsflush(buffer_1, help) < 0)
+ strerr_diefu1sys(111, "write to stdout") ;
+}
+
+static inline void tree_help (void)
+{
+ static char const *help =
+"66-info -T <options> \n"
+"\n"
+"options :\n"
+" -h: print this help\n"
+" -L: list available tree\n"
+" -t: get informations about the given tree\n"
+;
+
+ if (buffer_putsflush(buffer_1, help) < 0)
+ strerr_diefu1sys(111, "write to stdout") ;
+}
+
+static inline void sv_help (void)
+{
+ static char const *help =
+"66-info -S <options> service\n"
+"\n"
+"options :\n"
+" -h: print this help\n"
+" -t: tree to use\n"
+" -l: live directory\n"
+" -p: print n last lines of the associated logger\n"
+;
+
+ if (buffer_putsflush(buffer_1, help) < 0)
+ strerr_diefu1sys(111, "write to stdout") ;
+}
+char *print_nlog(char *str, int n)
+{
+ int r = 0 ;
+ int DELIM ='\n' ;
+ size_t slen = strlen(str) ;
+
+ if (n <= 0) return NULL;
+
+ size_t ndelim = 0;
+ char *target_pos = NULL;
+
+ r = get_rlen_until(str,DELIM,slen) ;
+
+ //target_pos = strrchr(str, DELIM);
+ target_pos = str + r ;
+
+ if (target_pos == NULL) return NULL;
+
+ while (ndelim < n)
+ {
+ while (str < target_pos && *target_pos != DELIM)
+ --target_pos;
+
+ if (*target_pos == DELIM)
+ --target_pos, ++ndelim;
+ else break;
+ }
+
+ if (str < target_pos)
+ target_pos += 2;
+
+ return target_pos ;
+}
+
+int get_fromdir(genalloc *ga, char const *srcdir,mode_t mode)
+{
+ int fdsrc ;
+
+ DIR *dir = opendir(srcdir) ;
+ if (!dir)
+ return 0 ;
+
+ fdsrc = dir_fd(dir) ;
+
+ for (;;)
+ {
+ struct stat st ;
+ direntry *d ;
+ d = readdir(dir) ;
+ if (!d) break ;
+ if (d->d_name[0] == '.')
+ if (((d->d_name[1] == '.') && !d->d_name[2]) || !d->d_name[1])
+ continue ;
+ if (stat_at(fdsrc, d->d_name, &st) < 0)
+ return 0 ;
+ if((st.st_mode & S_IFMT) == mode)
+ {
+ if (!str_diff(d->d_name,SS_BACKUP + 1)) continue ;
+ if (!stra_add(ga,d->d_name)) return 0 ;
+ }
+ }
+
+ return 1 ;
+}
+
+int print_status(char const *svname,char const *type,char const *treename, char const *const *envp)
+{
+ int r ;
+ int wstat ;
+ pid_t pid ;
+
+ stralloc livetree = STRALLOC_ZERO ;
+ stralloc svok = STRALLOC_ZERO ;
+
+ if (!stralloc_copy(&SCANDIR,&live)) retstralloc(111,"main") ;
+ if (!stralloc_copy(&livetree,&live)) retstralloc(111,"main") ;
+
+ r = set_livescan(&SCANDIR,owner) ;
+ if (!r) retstralloc(111,"main") ;
+ if(r < 0) strerr_dief3x(111,"live: ",SCANDIR.s," must be an absolute path") ;
+
+ if ((scandir_ok(SCANDIR.s)) !=1 )
+ {
+ if (buffer_putsflush(buffer_1,"scandir is not running\n") < 0) return 0 ;
+ goto out ;
+ }
+
+ if (!stralloc_copy(&livetree,&live)) retstralloc(111,"main") ;
+
+ r = set_livetree(&livetree,owner) ;
+ if (!r) retstralloc(111,"main") ;
+ if (r < 0 ) strerr_dief3x(111,"live: ",livetree.s," must be an absolute path") ;
+
+ if (get_enumbyid(type,key_enum_el) == CLASSIC)
+ {
+ size_t scanlen = SCANDIR.len - 1 ;
+ if (!stralloc_catb(&svok,SCANDIR.s,scanlen)) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,"/")) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,svname)) retstralloc(0,"print_status") ;
+ }
+ else if (get_enumbyid(type,key_enum_el) == LONGRUN)
+ {
+ size_t livelen = livetree.len -1 ;
+ if (!stralloc_catb(&svok,livetree.s,livelen)) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,"/")) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,treename)) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,SS_SVDIRS)) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,"/")) retstralloc(0,"print_status") ;
+ if (!stralloc_cats(&svok,svname)) retstralloc(0,"print_status") ;
+ }
+ else
+ {
+ if (buffer_putsflush(buffer_1,"nothing to display\n") < 0) return 0 ;
+ goto out ;
+ }
+ if (!stralloc_0(&svok)) retstralloc(0,"print_status") ;
+
+ r = s6_svc_ok(svok.s) ;
+ if (r != 1)
+ {
+ if (buffer_putsflush(buffer_1,"not running\n") < 0) return 0 ;
+ goto out ;
+ }
+ char const *newargv[3] ;
+ unsigned int m = 0 ;
+
+ newargv[m++] = SS_BINPREFIX "s6-svstat" ;
+ newargv[m++] = svok.s ;
+ 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,"status for service: ",svname) ;
+
+ out:
+ stralloc_free(&livetree) ;
+ stralloc_free(&svok) ;
+
+ return 1 ;
+}
+
+int tree_args(int argc, char const *const *argv)
+{
+ int r, list, comma, master ;
+
+ genalloc galist = GENALLOC_ZERO ;
+ stralloc tree = STRALLOC_ZERO ;
+ stralloc sacurrent = STRALLOC_ZERO ;
+
+ char treename[MAXSIZE] ;
+ char current[MAXSIZE] ;
+
+ r = tree_find_current(&sacurrent,base.s) ;
+ if (r)
+ {
+ size_t currlen = get_rlen_until(sacurrent.s,'/',sacurrent.len - 1) ;
+ size_t currnamelen = (sacurrent.len - 1) - currlen ;
+ memcpy(current, sacurrent.s + currlen + 1,currnamelen) ;
+ currnamelen-- ;
+ current[currnamelen] = 0 ;
+ }
+
+ size_t baselen = base.len - 1 ;
+ char src[baselen + SS_SYSTEM_LEN + 1] ;
+ memcpy(src,base.s,baselen) ;
+ memcpy(src + baselen,SS_SYSTEM, SS_SYSTEM_LEN) ;
+ src[baselen + SS_SYSTEM_LEN] = 0 ;
+
+ list = comma = master = 0 ;
+
+ {
+ subgetopt_t l = SUBGETOPT_ZERO ;
+
+ for (;;)
+ {
+ int opt = getopt_args(argc,argv, ">hLt:", &l) ;
+ if (opt == -1) break ;
+ if (opt == -2) strerr_dief1x(110,"options must be set first") ;
+
+ switch (opt)
+ {
+ case 'h' : tree_help(); return 0 ;
+ case 'L' : list = 1 ; break ;
+ case 't' : if(!stralloc_cats(&tree,l.arg)) retstralloc(111,"main") ;
+ if(!stralloc_0(&tree)) retstralloc(111,"main") ;
+ memcpy(treename,l.arg,strlen(l.arg)) ;
+ treename[strlen(l.arg)] = 0 ;
+ break ;
+ default : exit_tree_usage() ;
+ }
+ }
+ argc -= l.ind ; argv += l.ind ;
+ }
+
+ if (tree.len)
+ {
+ r = tree_sethome(&tree,base.s) ;
+ if (!r) strerr_diefu2sys(111,"find tree: ", tree.s) ;
+ }
+
+ if (list)
+ {
+ if (!get_fromdir(&galist, src, S_IFDIR)) return 0 ;
+ if (genalloc_len(stralist,&galist))
+ {
+ if (!bprintf(buffer_1,"%s\n","[Available tree]")) return 0 ;
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&galist) ; i++)
+ {
+ int enabled = tree_cmd_state(VERBOSITY,"-s",gaistr(&galist,i)) ;
+ if (!bprintf(buffer_1," %s : ",gaistr(&galist,i))) return 0 ;
+ if (obstr_equal(gaistr(&galist,i),current))
+ { if (!bprintf(buffer_1, "%s","current")) return 0 ; comma = 1 ; }
+ if (enabled)
+ {
+ if (comma) if(!bprintf(buffer_1, "%s",",")) return 0 ;
+ if (!bprintf(buffer_1, "%s","enabled")) return 0;
+ }
+ if (buffer_putflush(buffer_1,"\n",1) < 0) return 0 ;
+ comma = 0 ;
+ }
+ galist = genalloc_zero ;
+ }
+ }
+
+ if (tree.len)
+ {
+ size_t treelen = tree.len - 1 ;
+ size_t newlen ;
+ char what[treelen + SS_SVDIRS_LEN + SS_DB_LEN + SS_SRC_LEN + 1] ;
+ memcpy(what,tree.s,treelen) ;
+ memcpy(what + treelen, SS_SVDIRS,SS_SVDIRS_LEN) ;
+ newlen = treelen + SS_SVDIRS_LEN ;
+
+ if (!bprintf(buffer_1,"%s%s%s\n","[Service on tree: ",treename,"]")) return 0 ;
+
+ /** classic */
+ memcpy(what + newlen, SS_SVC, SS_SVC_LEN) ;
+ what[newlen + SS_SVC_LEN] = 0 ;
+
+ if (!bprintf(buffer_1," %s","classic :")) ;
+ if (!get_fromdir(&galist,what,S_IFDIR)) return 0 ;
+ if (genalloc_len(stralist,&galist))
+ {
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&galist) ; i++)
+ if (!bprintf(buffer_1," %s ",gaistr(&galist,i))) return 0 ;
+
+ galist = genalloc_zero ;
+ }
+ else if (!bprintf(buffer_1," %s ","nothing to display")) return 0 ;
+ if (buffer_putflush(buffer_1,"\n",1) < 0) return 0 ;
+
+ /** rc */
+ memcpy(what + newlen, SS_DB, SS_DB_LEN) ;
+ memcpy(what + newlen + SS_DB_LEN, SS_SRC, SS_SRC_LEN) ;
+ what[newlen + SS_DB_LEN + SS_SRC_LEN] = 0 ;
+
+ if (!bprintf(buffer_1," %s","rc :")) ;
+ if (!get_fromdir(&galist,what,S_IFDIR)) return 0 ;
+ if (genalloc_len(stralist,&galist) > 1) //only pass if Master is not alone
+ {
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&galist) ; i++)
+ {
+ if (!str_diff(gaistr(&galist,i),SS_MASTER+1))
+ continue ;
+ if (!bprintf(buffer_1," %s ",gaistr(&galist,i))) return 0 ;
+ }
+ galist = genalloc_zero ;
+ }
+ else if (!bprintf(buffer_1," %s ","nothing to display")) return 0 ;
+ if (buffer_putflush(buffer_1,"\n",1) < 0) return 0 ;
+
+
+ }
+
+ stralloc_free(&tree) ;
+ stralloc_free(&sacurrent) ;
+ genalloc_deepfree(stralist,&galist,stra_free) ;
+
+ return 1 ;
+}
+
+int sv_args(int argc, char const *const *argv,char const *const *envp)
+{
+ int r ;
+ unsigned int nlog = 0 ;
+
+ stralloc tree = STRALLOC_ZERO ;
+ stralloc what = STRALLOC_ZERO ;
+ genalloc gawhat = GENALLOC_ZERO ;
+ stralloc type = STRALLOC_ZERO ;
+
+ char const *svname = NULL ;
+
+ r = 0 ;
+
+ {
+ subgetopt_t l = SUBGETOPT_ZERO ;
+
+ for (;;)
+ {
+ int opt = getopt_args(argc,argv, ">hl:t:p:", &l) ;
+ if (opt == -1) break ;
+ if (opt == -2) strerr_dief1x(110,"options must be set first") ;
+ switch (opt)
+ {
+ case 'h' : sv_help(); return 0 ;
+ case 't' : if(!stralloc_cats(&tree,l.arg)) retstralloc(111,"main") ;
+ if(!stralloc_0(&tree)) retstralloc(111,"main") ;
+ break ;
+ case 'l' : if (!stralloc_cats(&live,l.arg)) retstralloc(111,"main") ;
+ if (!stralloc_0(&live)) retstralloc(111,"main") ;
+ break ;
+ case 'p' : if (!uint0_scan(l.arg, &nlog)) exitusage() ; break ;
+ default : exit_sv_usage() ;
+ }
+ }
+ argc -= l.ind ; argv += l.ind ;
+ }
+ if (argc > 1 || !argc) exit_sv_usage() ;
+ svname = *argv ;
+
+ r = set_livedir(&live) ;
+ if (!r) retstralloc(111,"main") ;
+ if (r < 0 ) strerr_dief3x(111,"live: ",live.s," must be an absolute path") ;
+
+ r = tree_sethome(&tree,base.s) ;
+ if (r < 0) strerr_diefu1x(110,"find the current tree. You must use -t options") ;
+ if (!r) strerr_diefu2sys(111,"find tree: ", tree.s) ;
+
+ size_t treelen = get_rlen_until(tree.s,'/',tree.len - 1) ;
+ size_t treenamelen = (tree.len - 1) - treelen ;
+ char treename[treenamelen + 1] ;
+ memcpy(treename, tree.s + treelen + 1,treenamelen) ;
+ treenamelen-- ;
+ treename[treenamelen] = 0 ;
+
+ if (!bprintf(buffer_1,"%s%s%s\n","[",svname,"]")) return 0 ;
+
+ if (!resolve_pointo(&saresolve,base.s,live.s,tree.s,treename,0,SS_RESOLVE_SRC))
+ strerr_diefu1x(111,"set revolve pointer to source") ;
+ /** retrieve type but do not print it*/
+ r = resolve_read(&type,saresolve.s,svname,"type") ;
+ if (r < -1) strerr_dief2sys(111,"invalid .resolve directory: ",saresolve.s) ;
+ if (r <= 0) strerr_diefu2x(111,"read type of: ",svname) ;
+
+ /** status */
+ if (buffer_putsflush(buffer_1,"status : ") < 0) return 0 ;
+ print_status(svname,type.s,treename,envp) ;
+
+ /** print the type */
+ if (!bprintf(buffer_1,"%s %s\n","type :",type.s)) return 0 ;
+
+ /** description */
+ r = resolve_read(&what,saresolve.s,svname,"description") ;
+ if (r < -1) strerr_dief2sys(111,"invalid .resolve directory: ",saresolve.s) ;
+ if (r <= 0) strerr_diefu2x(111,"read description of: ",svname) ;
+ if (!bprintf(buffer_1,"%s %s\n","description :",what.s)) return 0 ;
+
+ /** dependencies */
+ if (get_enumbyid(type.s,key_enum_el) > CLASSIC)
+ {
+ if (get_enumbyid(type.s,key_enum_el) == BUNDLE)
+ {
+ if (!bprintf(buffer_1,"%s\n","contents :")) return 0 ;
+ }
+ else if (!bprintf(buffer_1,"%s\n","depends on :")) return 0 ;
+ r = resolve_read(&what,saresolve.s,svname,"deps") ;
+ if (what.len)
+ {
+ if (!clean_val(&gawhat,what.s)) return 0 ;
+
+ for (unsigned int i = 0 ; i < genalloc_len(stralist,&gawhat) ; i++)
+ {
+ if (!bprintf(buffer_1," %s ",gaistr(&gawhat,i))) return 0 ;
+ }
+ }
+ else if (!bprintf(buffer_1," %s ","nothing to display")) return 0 ;
+ if (buffer_putflush(buffer_1,"\n",1) < 0) return 0 ;
+ }
+
+ /** logger */
+ if (get_enumbyid(type.s,key_enum_el) == CLASSIC || get_enumbyid(type.s,key_enum_el) == LONGRUN)
+ {
+ if (!bprintf(buffer_1,"%s ","logger at :")) return 0 ;
+ r = resolve_read(&what,saresolve.s,svname,"logger") ;
+ if (r < -1) strerr_dief2sys(111,"invalid .resolve directory: ",saresolve.s) ;
+ if (r <= 0)
+ {
+ if (!bprintf(buffer_1,"%s \n","apparently not")) return 0 ;
+ }
+ else
+ {
+ r = resolve_read(&what,saresolve.s,svname,"dstlog") ;
+ if (r < -1) strerr_dief2sys(111,"invalid .resolve directory: ",saresolve.s) ;
+ if (r <= 0)
+ {
+ if (!bprintf(buffer_1,"%s \n","unset")) return 0 ;
+ }
+ else
+ {
+ if (!bprintf(buffer_1,"%s \n",what.s)) return 0 ;
+ if (nlog)
+ {
+ stralloc log = STRALLOC_ZERO ;
+ if (!file_readputsa(&log,what.s,"current")) retstralloc(0,"sv_args") ;
+ if (!bprintf(buffer_1,"%s \n",print_nlog(log.s,nlog))) return 0 ;
+ stralloc_free(&log) ;
+ }
+ }
+ }
+ }
+ if (buffer_putsflush(buffer_1,"") < 0) return 0 ;
+
+ stralloc_free(&tree) ;
+ stralloc_free(&what) ;
+ stralloc_free(&type) ;
+ genalloc_deepfree(stralist,&gawhat,stra_free) ;
+
+ return 0 ;
+}
+int main(int argc, char const *const *argv, char const *const *envp)
+{
+ int what ;
+
+ what = -1 ;
+
+ PROG = "66-info" ;
+ {
+ subgetopt_t l = SUBGETOPT_ZERO ;
+
+ for (;;)
+ {
+ int opt = getopt_args(2,argv, ">hTS", &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 'T' : what = 0 ; break ;
+ case 'S' : what = 1 ; break ;
+ default : exitusage() ;
+ }
+ }
+ }
+ if (what<0) exitusage() ;
+
+ owner = MYUID ;
+
+ /*
+ setlocale(LC_ALL, "");
+
+ if(!str_diff(nl_langinfo(CODESET), "UTF-8")) {
+ style = &graph_utf8;
+ }
+ */
+
+ if (!set_ownersysdir(&base,owner)) strerr_diefu1sys(111, "set owner directory") ;
+
+ if (!what) tree_args(--argc,++argv) ;
+ if (what) sv_args(--argc,++argv,envp) ;
+
+ stralloc_free(&base) ;
+ stralloc_free(&live) ;
+ stralloc_free(&SCANDIR) ;
+ stralloc_free(&saresolve) ;
+ return 0 ;
+}
diff --git a/src/66/66-svctl.c b/src/66/66-svctl.c
index b919afb3259ecaf4d0f9519702f5e9793fa12e55..499cedd7b4a5f1237737ebaa5f4570651fa04853 100644
--- a/src/66/66-svctl.c
+++ b/src/66/66-svctl.c
@@ -69,7 +69,7 @@ struct svc_sig_s
.deadline = TAIN_ZERO \
}
-unsigned int SV_DEADLINE = 5000 ;
+unsigned int SV_DEADLINE = 1000 ;
typedef enum state_e state_t, *state_t_ref ;
enum state_e
diff --git a/src/66/66-tree.c b/src/66/66-tree.c
index 03751634cbd7e1fc310e123af668dc8280174222..67015864fa324f68c474fd8175b34cc0da51d9f8 100644
--- a/src/66/66-tree.c
+++ b/src/66/66-tree.c
@@ -129,14 +129,14 @@ int sanitize_tree(stralloc *dstree, char const *base, char const *tree)
return -1 ;
}
- if (!r) return 0 ;
-
/** we have one, keep it*/
if (!stralloc_cats(dstree,dst)) retstralloc(0,"sanitize_tree") ;
if (!stralloc_cats(dstree,"/")) retstralloc(0,"sanitize_tree") ;
if (!stralloc_cats(dstree,tree)) retstralloc(0,"sanitize_tree") ;
if (!stralloc_0(dstree)) retstralloc(0,"sanitize_tree") ;
+ if (!r) return 0 ;
+
return 1 ;
}
diff --git a/src/66/deps-exe/66-info b/src/66/deps-exe/66-info
new file mode 100644
index 0000000000000000000000000000000000000000..74e2dccd541daa48d66693911b021bb4e402efba
--- /dev/null
+++ b/src/66/deps-exe/66-info
@@ -0,0 +1,4 @@
+${LIB66}
+-loblibs
+-ls6
+-lskarnet
diff --git a/src/include/66/parser.h b/src/include/66/parser.h
index eba8b063ed8fe4a6a7ba45b012d0cc5923ff137c..fb65156dacbbfeb38f7ddd9a77ba98e7e2d9b188 100644
--- a/src/include/66/parser.h
+++ b/src/include/66/parser.h
@@ -310,13 +310,13 @@ extern int keep_logger(sv_execlog *log,keynocheck *nocheck) ;
extern int write_services(sv_alltype *sv, char const *workdir, unsigned int force) ;
-extern int write_classic(char const *src, sv_alltype *sv, char const *dst, unsigned int force) ;
+extern int write_classic(char const *workdir, sv_alltype *sv, char const *dst, unsigned int force) ;
-extern int write_longrun(char const *src, sv_alltype *sv,char const *dst, unsigned int force) ;
+extern int write_longrun(char const *workdir, sv_alltype *sv,char const *dst, unsigned int force) ;
-extern int write_oneshot(char const *src, sv_alltype *sv,char const *dst, unsigned int force) ;
+extern int write_oneshot(char const *workdir, sv_alltype *sv,char const *dst, unsigned int force) ;
-extern int write_bundle(char const *src, sv_alltype *sv, char const *dst, unsigned int force) ;
+extern int write_bundle(char const *workdir, sv_alltype *sv, char const *dst, unsigned int force) ;
extern int write_common(sv_alltype *sv, char const *dst) ;
@@ -324,7 +324,7 @@ extern int write_exec(sv_alltype *sv, sv_exec *exec,char const *name,char const
extern int write_uint(char const *dst, char const *name, uint32_t ui) ;
-extern int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *dst, char const *svname,int mode, unsigned int force) ;
+extern int write_logger(char const *workdir,sv_alltype *sv, sv_execlog *log,char const *name, char const *dst, char const *svname,int mode, unsigned int force) ;
extern int write_consprod(sv_alltype *sv,char const *prodname,char const *consname,char const *proddst,char const *consdst) ;
diff --git a/src/lib66/parser_write.c b/src/lib66/parser_write.c
index 687eaa4c486d05d9cf8bb7558634ec7578ba61c1..3051e43d6f5899d103eff076a3823b55bffb9386 100644
--- a/src/lib66/parser_write.c
+++ b/src/lib66/parser_write.c
@@ -93,7 +93,12 @@ int write_services(sv_alltype *sv, char const *workdir, unsigned int force)
VERBO3 strerr_warnwu2sys("create ",wname) ;
return 0 ;
}
-
+ /** resolve directory*/
+ if (!resolve_remove_service(workdir,name))
+ {
+ VERBO3 strerr_warnwu2sys("remove resolve directory for: ",name) ;
+ return 0 ;
+ }
}
else if (r && !force)
{
@@ -140,16 +145,17 @@ int write_services(sv_alltype *sv, char const *workdir, unsigned int force)
VERBO3 strerr_warni2x("unkown type: ", get_keybyid(sv->cname.itype)) ;
break ;
}
- /** resolve directory*/
- if (!resolve_remove_service(workdir,name))
+
+ //VERBO2 strerr_warnt4x("write resolve file ", workdir,SS_RESOLVE,"/type ...") ;
+ if (!resolve_write(workdir,name,"type",get_keybyid(type),force))
{
- VERBO3 strerr_warnwu2sys("remove resolve directory for: ",name) ;
+ VERBO3 strerr_warnwu2x("write resolve file: type for service: ",name) ;
return 0 ;
}
- //VERBO2 strerr_warnt4x("write resolve file ", src,SS_RESOLVE,"/type ...") ;
- if (!resolve_write(workdir,name,"type",get_keybyid(type),force))
+
+ if (!resolve_write(workdir,name,"description",keep.s+sv->cname.description,force))
{
- VERBO3 strerr_warnwu2x("write resolve file: type for service: ",name) ;
+ VERBO3 strerr_warnwu2x("write resolve file: description for service: ",name) ;
return 0 ;
}
if (type == CLASSIC || type == BUNDLE || type == ONESHOT || (type == LONGRUN && force))
@@ -208,7 +214,7 @@ int write_services(sv_alltype *sv, char const *workdir, unsigned int force)
return 1 ;
}
-int write_classic(char const *src, sv_alltype *sv, char const *dst, unsigned int force)
+int write_classic(char const *workdir, sv_alltype *sv, char const *dst, unsigned int force)
{
/**notification,timeout, ...*/
if (!write_common(sv, dst))
@@ -234,7 +240,7 @@ int write_classic(char const *src, sv_alltype *sv, char const *dst, unsigned int
/**logger */
if (sv->opts[0])
{
- if (!write_logger(sv, &sv->type.classic_longrun.log,"log",dst,keep.s+sv->cname.name,0755,force))
+ if (!write_logger(workdir,sv, &sv->type.classic_longrun.log,"log",dst,keep.s+sv->cname.name,0755,force))
{
VERBO3 strerr_warnwu3x("write: ",dst,"/log") ;
return 0 ;
@@ -245,7 +251,7 @@ int write_classic(char const *src, sv_alltype *sv, char const *dst, unsigned int
return 1 ;
}
-int write_longrun(char const *src, sv_alltype *sv,char const *dst, unsigned force)
+int write_longrun(char const *workdir, sv_alltype *sv,char const *dst, unsigned force)
{
size_t r ;
char *name = keep.s+sv->cname.name ;
@@ -286,7 +292,7 @@ int write_longrun(char const *src, sv_alltype *sv,char const *dst, unsigned forc
r = byte_search(dst,dstlen,keep.s+sv->cname.name,namelen) ;
memcpy(dstlog,dst,r) ;
dstlog[r] = 0 ;
- if (!write_logger(sv, &sv->type.classic_longrun.log,logname,dstlog,keep.s+sv->cname.name,0644,force))
+ if (!write_logger(workdir,sv, &sv->type.classic_longrun.log,logname,dstlog,keep.s+sv->cname.name,0644,force))
{
VERBO3 strerr_warnwu3x("write: ",dstlog,logname) ;
return 0 ;
@@ -299,7 +305,7 @@ int write_longrun(char const *src, sv_alltype *sv,char const *dst, unsigned forc
}
/** dependencies */
- if (!write_dependencies(src,&sv->cname, dst, "dependencies", &gadeps,force))
+ if (!write_dependencies(workdir,&sv->cname, dst, "dependencies", &gadeps,force))
{
VERBO3 strerr_warnwu3x("write: ",dst,"/dependencies") ;
return 0 ;
@@ -360,7 +366,7 @@ int write_bundle(char const *src, sv_alltype *sv, char const *dst, unsigned int
return 1 ;
}
-int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *dst, char const *svname,int mode, unsigned int force)
+int write_logger(char const *workdir, sv_alltype *sv, sv_execlog *log,char const *name, char const *dst, char const *svname,int mode, unsigned int force)
{
int r ;
int logbuild = log->run.build ;
@@ -378,8 +384,7 @@ 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 ;
-
-
+
if(!stralloc_cats(&ddst,dst)) retstralloc(0,"write_logger") ;
if(!stralloc_cats(&ddst,"/")) retstralloc(0,"write_logger") ;
if(!stralloc_cats(&ddst,name)) retstralloc(0,"write_logger") ;
@@ -441,7 +446,6 @@ 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)
@@ -541,6 +545,12 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
return 0 ;
}
}
+
+ if (!resolve_write(workdir,svname,"dstlog",destlog.s,force))
+ {
+ VERBO3 strerr_warnwu2x("write resolve file: dstlogger for service: ",name) ;
+ return 0 ;
+ }
break;
case CUSTOM:
if (!write_exec(sv, &log->run,"run",ddst.s,mode))
@@ -555,41 +565,22 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
}
- /** create the corresponding log directory*/
- size_t destlen = get_rlen_until(destlog.s,'/',destlog.len) ;
- destlog.len = destlen ;
- if (!stralloc_0(&destlog)) retstralloc(0,"write_logger") ;
-
- r = dir_search(destlog.s,svname,S_IFDIR) ;
- if (r < 0)
+ /** create the corresponding log directory
+ * only pass through here if destlog was set */
+ if (logbuild == AUTO)
{
- VERBO3 strerr_warnw4x(destlog.s,"/",svname," already exist with different mode") ;
- return 0 ;
- }
- if (!r)
- {
- r = dir_create_under(destlog.s,svname,0755) ;
+ size_t destlen = get_rlen_until(destlog.s,'/',destlog.len) ;
+ destlog.len = destlen ;
+ if (!stralloc_0(&destlog)) retstralloc(0,"write_logger") ;
+
+ r = dir_search(destlog.s,svname,S_IFDIR) ;
if (r < 0)
{
- VERBO3 strerr_warnwu5sys("create ",destlog.s,"/",svname," directory") ;
+ VERBO3 strerr_warnw4x(destlog.s,"/",svname," already exist with different mode") ;
return 0 ;
}
- }
-/* if (r)
- {
- if (force)
+ if (!r)
{
- char tmp[destlen + 1 + strlen(svname) + 1];
- memcpy(tmp,destlog.s, destlen) ;
- tmp[destlen] = '/' ;
- memcpy(tmp + destlen + 1,svname,strlen(svname)) ;
- tmp[destlen + 1 + strlen(svname)] = 0 ;
-
- if (rm_rf(tmp) < 0)
- {
- VERBO3 strerr_warnwu2sys("remove log directory: ",tmp) ;
- return 0 ;
- }
r = dir_create_under(destlog.s,svname,0755) ;
if (r < 0)
{
@@ -597,13 +588,35 @@ int write_logger(sv_alltype *sv, sv_execlog *log,char const *name, char const *d
return 0 ;
}
}
- else
+ /* if (r)
{
- VERBO3 strerr_warnw5x("ignoring creation of: ",destlog.s,"/",svname,": already exist") ;
- return 1 ;
- }
- }*/
-
+ if (force)
+ {
+ char tmp[destlen + 1 + strlen(svname) + 1];
+ memcpy(tmp,destlog.s, destlen) ;
+ tmp[destlen] = '/' ;
+ memcpy(tmp + destlen + 1,svname,strlen(svname)) ;
+ tmp[destlen + 1 + strlen(svname)] = 0 ;
+
+ if (rm_rf(tmp) < 0)
+ {
+ VERBO3 strerr_warnwu2sys("remove log directory: ",tmp) ;
+ return 0 ;
+ }
+ r = dir_create_under(destlog.s,svname,0755) ;
+ if (r < 0)
+ {
+ VERBO3 strerr_warnwu5sys("create ",destlog.s,"/",svname," directory") ;
+ return 0 ;
+ }
+ }
+ else
+ {
+ VERBO3 strerr_warnw5x("ignoring creation of: ",destlog.s,"/",svname,": already exist") ;
+ return 1 ;
+ }
+ }*/
+ }
stralloc_free(&shebang) ;
stralloc_free(&ui) ;
@@ -664,39 +677,6 @@ int write_consprod(sv_alltype *sv,char const *prodname,char const *consname,char
return 1 ;
}
-int write_dependencies(char const *src, sv_name_t *cname,char const *dst,char const *filename, genalloc *ga, unsigned int force)
-{
- char *name = keep.s + cname->name ;
-
- stralloc contents = STRALLOC_ZERO ;
-
- for (unsigned int i = 0; i < cname->nga; i++)
- {
- if (!stralloc_cats(&contents,deps.s+genalloc_s(unsigned int,ga)[cname->idga+i])) retstralloc(0,"write_dependencies") ;
- if (!stralloc_cats(&contents,"\n")) retstralloc(0,"write_dependencies") ;
- }
- if (contents.len)
- {
- if (!file_write_unsafe(dst,filename,contents.s,contents.len))
- {
- VERBO3 strerr_warnwu3sys("create file: ",dst,filename) ;
- goto err ;
- }
- if (!resolve_write(src,name,"deps",contents.s,force))
- {
- VERBO3 strerr_warnwu2x("write resolve file: deps for service: ",name) ;
- goto err ;
- }
- }
-
- stralloc_free(&contents) ;
-
- return 1 ;
- err:
- stralloc_free(&contents) ;
- return 0 ;
-}
-
int write_common(sv_alltype *sv, char const *dst)
{
int r ;
@@ -942,7 +922,40 @@ int write_exec(sv_alltype *sv, sv_exec *exec,char const *file,char const *dst,in
return 1 ;
}
-
+int write_dependencies(char const *src, sv_name_t *cname,char const *dst,char const *filename, genalloc *ga, unsigned int force)
+{
+ char *name = keep.s + cname->name ;
+
+ stralloc contents = STRALLOC_ZERO ;
+
+ for (unsigned int i = 0; i < cname->nga; i++)
+ {
+ if (!stralloc_cats(&contents,deps.s+genalloc_s(unsigned int,ga)[cname->idga+i])) retstralloc(0,"write_dependencies") ;
+ if (!stralloc_cats(&contents,"\n")) retstralloc(0,"write_dependencies") ;
+ }
+
+ if (contents.len)
+ {
+ if (!file_write_unsafe(dst,filename,contents.s,contents.len))
+ {
+ VERBO3 strerr_warnwu3sys("create file: ",dst,filename) ;
+ goto err ;
+ }
+ if (!stralloc_0(&contents)) retstralloc(0,"write_dependencies") ;
+ if (!resolve_write(src,name,"deps",contents.s,force))
+ {
+ VERBO3 strerr_warnwu2x("write resolve file: deps for service: ",name) ;
+ goto err ;
+ }
+ }
+
+ stralloc_free(&contents) ;
+
+ return 1 ;
+ err:
+ stralloc_free(&contents) ;
+ return 0 ;
+}
int write_uint(char const *dst, char const *name, uint32_t ui)
{
diff --git a/src/lib66/resolve.c b/src/lib66/resolve.c
index fef8298c36515fabef10b4e3ebaf453e07b17f60..ab8fa4aeb556edc20864ee5a0d66f3cb5033650c 100644
--- a/src/lib66/resolve.c
+++ b/src/lib66/resolve.c
@@ -104,9 +104,9 @@ int resolve_write(char const *dst,char const *svname, char const *file, char con
VERBO3 strerr_warnwu3sys("create directory: ",solve,svname) ;
return 0 ;
}
+ memcpy(solve + newlen,svname,namelen) ;
}
-
- memcpy(solve + newlen,svname,namelen) ;
+
solve[newlen + namelen] = '/' ;
solve[newlen + namelen + 1] = 0 ;
newlen = newlen + namelen + 1 ;