add 66-info

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 :=

package/modes

@@ -8,4 +8,5 @@
 66-stop			0755
 66-svctl		0755
 66-all			0755
+66-info			0755
 execl-cmdline	0755

package/targets.mak

@@ -9,6 +9,7 @@ BIN_TARGETS := \
 66-stop \
 66-svctl \
 66-all \
+66-info \
 execl-cmdline
 
 LIB_DEFS := 66=66

src/66/66-info.c

+/* 
+ * 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 ] [ -v verbosity ] [ -L list] [ -t tree ]"
+#define exit_tree_usage() strerr_dieusage(100, TREE_USAGE)
+#define SV_USAGE "66-info -S [ -help ] [ -v verbosity ] [ -t tree ] [ -s status] 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" 
+"	-v: increase/decrease verbosity\n"
+"	-L: list available tree\n"
+"	-t: get informations about 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" 
+"	-v: increase/decrease verbosity\n"
+"	-t: tree to use\n"
+"	-s: status\n"
+;
+
+ if (buffer_putsflush(buffer_1, help) < 0)
+    strerr_diefu1sys(111, "write to stdout") ;
+}
+
+int print_status(char const *svname,char const *const *envp)
+{
+	int r ;
+	int wstat ;
+	pid_t pid ;
+	/** TODO longrun need to be check with prefix*/
+	if (!stralloc_copy(&SCANDIR,&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,"not running\n") < 0) return 0 ;
+		return 1 ;
+	}
+	size_t svnamelen = strlen(svname) ;
+	size_t scanlen = SCANDIR.len - 1 ;
+	char svok[scanlen + 1 + svnamelen + 1] ;
+	memcpy(svok,SCANDIR.s,scanlen) ;
+	svok[scanlen] = '/' ;
+	memcpy(svok + scanlen + 1, svname,svnamelen) ;
+	svok[scanlen + 1 + svnamelen] = 0 ;
+	
+	r = s6_svc_ok(svok) ;
+	if (r != 1)
+	{
+		if (buffer_putsflush(buffer_1,"not running\n") < 0) return 0 ;
+		return 1 ;
+	}
+	char const *newargv[3] ;
+	unsigned int m = 0 ;
+	
+	newargv[m++] = SS_BINPREFIX "s6-svstat" ;
+	newargv[m++] = svok ;
+	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) ;
+	
+	return 1 ;
+}
+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 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, ">hv:Lt:", &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 'v' :  if (!uint0_scan(l.arg, &VERBOSITY)) exitusage() ; break ;
+				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 ;
+}
+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 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, ">hv:l: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 'v' :  if (!uint0_scan(l.arg, &VERBOSITY)) exitusage() ; break ;
+				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 ;
+	
+	/** status */
+	if (buffer_putsflush(buffer_1,"status : ") < 0) return 0 ;
+	print_status(svname,envp) ;
+	
+	if (!resolve_pointo(&saresolve,base.s,live.s,tree.s,treename,0,SS_RESOLVE_SRC))
+		strerr_diefu1x(111,"set revolve pointer to source") ;
+	/** type */	
+	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) ;
+	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 ;
+				}
+			}
+		}
+	}
+		
+	if (buffer_putsflush(buffer_1,"") < 0) return 0 ;
+	/** statut */
+	
+	
+	
+	
+	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 ;
+}

src/66/deps-exe/66-info

+${LIB66}
+-loblibs
+-ls6
+-lskarnet