add -c,-s,-V,-i options: -c change the symlink to target to the specified...

add -c,-s,-V,-i options: -c change the symlink to target to the specified version. -s handle a specific version for command -L|V|e|r. -V displays available version. -i import extra configuration file from a version to another

src/lib66/ssexec_env.c

@@ -14,6 +14,7 @@
  
 #include <string.h>
 #include <stdlib.h>//getenv
+#include <unistd.h>//_exit
 
 #include <oblibs/obgetopt.h>
 #include <oblibs/log.h>
@@ -41,6 +42,7 @@ enum tasks_e
 {
 	T_UNSET = 0 ,
 	T_EDIT ,
+	T_VLIST ,
 	T_LIST ,
 	T_REPLACE
 } ;
@@ -49,200 +51,260 @@ enum tasks_e
 #define checkopts(n) if (n >= MAXOPTS) log_die(LOG_EXIT_USER, "too many versions number")
 #define DELIM ','
 
-static void check_version(char *result, char const *conf_dir, char const *version)
+static void check_version(stralloc *sa, char const *version)
 {
 	int r ;
-	stralloc sa = STRALLOC_ZERO ;
-
-	r = version_scan(&sa,version,SS_CONFIG_VERSION_NDOT) ;
+	r = version_scan(sa,version,SS_CONFIG_VERSION_NDOT) ;
 	if (r == -1) log_die_nomem("stralloc") ;
 	if (!r) log_die(LOG_EXIT_USER,"invalid version format") ;
+}
+
+static void append_version(stralloc *saversion, char const *svconf, char const *version)
+{
+	int r ;
+	stralloc sa = STRALLOC_ZERO ;
+
+	check_version(&sa,version) ;
 
-	auto_strings(result,conf_dir,"/",sa.s) ;
+	saversion->len = 0 ;
 
-	r = scan_mode(result,S_IFDIR) ;
-	if (r == -1 || !r) log_dieusys(LOG_EXIT_USER,"find the versioned directory: ",result) ;
+	if (!auto_stra(saversion,svconf,"/",sa.s)) log_die_nomem("stralloc") ;
+
+	r = scan_mode(saversion->s,S_IFDIR) ;
+	if (r == -1 || !r) log_dieusys(LOG_EXIT_USER,"find the versioned directory: ",saversion->s) ;
 
 	stralloc_free(&sa) ;
 }
 
-static void do_import(char const *svname, char const *conf_dir, char const *version)
+static uint8_t check_current_version(char const *svconf,char const *version)
+{
+	stralloc sa = STRALLOC_ZERO ;
+	size_t svconflen = strlen(svconf) ;
+	char tmp[svconflen + SS_SYM_VERSION_LEN + 1] ;
+	auto_strings(tmp,svconf,SS_SYM_VERSION) ;
+	if (sareadlink(&sa,tmp) == -1) log_dieusys(LOG_EXIT_SYS,"readlink: ",sa.s) ;
+	if (!stralloc_0(&sa)) log_die_nomem("stralloc") ;
+	char bname[sa.len + 1] ;
+	if (!ob_basename(bname,sa.s)) log_dieu(LOG_EXIT_SYS,"get current version") ;
+	stralloc_free(&sa) ;
+	return !version_cmp(bname,version,SS_CONFIG_VERSION_NDOT) ? 1 : 0 ;
+}
+
+static void run_editor(char const *src, char const *const *envp)
+{
+	char *editor = getenv("EDITOR") ;
+	if (!editor) {
+		editor = getenv("SUDO_USER") ;
+		if (editor) log_dieu(LOG_EXIT_SYS,"get EDITOR with sudo command -- please try to use the -E sudo option e.g. sudo -E 66-env -e <service>") ;
+		else log_dieusys(LOG_EXIT_SYS,"get EDITOR") ;
+	}
+	char const *const newarg[3] = { editor, src, 0 } ;
+	xpathexec_run (newarg[0],newarg,envp) ;
+}
+
+static void do_import(char const *svname, char const *svconf, char const *version)
 {
 	struct stat st ;
-  	size_t pos = 0, conflen = strlen(conf_dir) ;
+	size_t pos = 0 ;
 	stralloc salist = STRALLOC_ZERO ;
-	stralloc sa = STRALLOC_ZERO ;
+	stralloc sasrc = STRALLOC_ZERO ;
+	stralloc sadst = STRALLOC_ZERO ;
 	
 	char *src_version = 0 ;
 	char *dst_version = 0 ;
 
-	if (!sastr_clean_string_wdelim(&sa,version,DELIM)) log_dieu(LOG_EXIT_SYS,"clean string: ",version) ;
+	if (!sastr_clean_string_wdelim(&sasrc,version,DELIM)) log_dieu(LOG_EXIT_SYS,"clean string: ",version) ;
 
-	unsigned int n = sastr_len(&sa) ;
+	unsigned int n = sastr_len(&sasrc) ;
 	checkopts(n) ;
 	
-	for (;pos < sa.len; pos += strlen(sa.s + pos) + 1)
+	for (;pos < sasrc.len; pos += strlen(sasrc.s + pos) + 1)
 	{
-		if (!pos) src_version = sa.s + pos ;
-		else dst_version = sa.s + pos ;
+		if (!pos) src_version = sasrc.s + pos ;
+		else dst_version = sasrc.s + pos ;
 	}
 	
-	char src[conflen + 1 + strlen(src_version) + 1] ;
-	char dst[conflen + 1 + strlen(dst_version) + 1] ;
-	
-	check_version(src,conf_dir,src_version) ;
-	check_version(dst,conf_dir,dst_version) ;
+	append_version(&sasrc,svconf,src_version) ;
+	append_version(&sadst,svconf,dst_version) ;
 	
-	size_t srclen = strlen(src), dstlen = strlen(dst) ;
-	
-	if (!sastr_dir_get(&salist,src,svname,S_IFREG))
-		log_dieu(LOG_EXIT_SYS,"get configuration file from directory: ",src) ;
+	if (!sastr_dir_get(&salist,sasrc.s,svname,S_IFREG))
+		log_dieu(LOG_EXIT_SYS,"get configuration file from directory: ",sasrc.s) ;
 	
 	for (pos = 0 ; pos < salist.len; pos += strlen(salist.s + pos) + 1)
 	{
 		char *name = salist.s + pos ;
 		size_t namelen = strlen(name) ;
 		
-		char s[srclen + 1 + namelen + 1] ;
-		auto_strings(s,src,"/",name) ;
+		char s[sasrc.len + 1 + namelen + 1] ;
+		auto_strings(s,sasrc.s,"/",name) ;
 		
-		char d[dstlen + 1 + namelen + 1] ;
-		auto_strings(d,dst,"/",name) ;
+		char d[sadst.len + 1 + namelen + 1] ;
+		auto_strings(d,sadst.s,"/",name) ;
 		
 		if (lstat(s, &st) < 0) log_dieusys(LOG_EXIT_SYS,"stat: ",s) ;
 		log_info("copy: ",s," to: ",d) ;
 		if (!filecopy_unsafe(s, d, st.st_mode)) log_dieusys(LOG_EXIT_SYS,"copy: ", s," to: ",d) ;
 	}
 
-	stralloc_free(&sa) ;
+	stralloc_free(&sasrc) ;
+	stralloc_free(&sadst) ;
 	stralloc_free(&salist) ;
 }
 
 int ssexec_env(int argc, char const *const *argv,char const *const *envp,ssexec_t *info)
 {
 	int r ;
-
+	size_t pos = 0 ;
 	stralloc satmp = STRALLOC_ZERO ;
 	stralloc sasrc = STRALLOC_ZERO ;
 	stralloc saversion = STRALLOC_ZERO ;
+	stralloc eversion = STRALLOC_ZERO ;
 	stralloc savar = STRALLOC_ZERO ;
 	stralloc salist = STRALLOC_ZERO ;
 	ss_resolve_t res = RESOLVE_ZERO ;
 
-	uint8_t todo = T_UNSET, sym_switch = 0  ;
+	uint8_t todo = T_UNSET ;
 
-	char const *sv = 0, *src = 0, *treename = 0, *editor = 0, *import = 0 ;
+	char const *sv = 0, *svconf = 0, *src = 0, *treename = 0, *import = 0 ;
 
 	{
 		subgetopt_t l = SUBGETOPT_ZERO ;
 
 		for (;;)
 		{
-			int opt = getopt_args(argc,argv, ">Ld:r:es:i:", &l) ;
+			int opt = getopt_args(argc,argv, ">c:s:VLd:r:ei:", &l) ;
 			if (opt == -1) break ;
 			if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
 			switch (opt)
 			{
+				case 'c' :	check_version(&saversion,l.arg) ;
+							break ;
+				case 's' :	check_version(&eversion,l.arg) ;
+							break ;
+				case 'V' : 	if (todo != T_UNSET) log_usage(usage_env) ;
+							todo = T_VLIST ;
+							break ;
 				case 'L' : 	if (todo != T_UNSET) log_usage(usage_env) ;
-							todo = T_LIST ; break ;
-				case 'd' :	src = l.arg ; break ;
+							todo = T_LIST ;
+							break ;
+				case 'd' :	log_1_warn("-d: deprecated option") ; _exit(0) ;
 				case 'r' :	if (!stralloc_cats(&savar,l.arg) ||
-							!stralloc_0(&savar)) log_die_nomem("stralloc") ; 
+							!stralloc_0(&savar)) log_die_nomem("stralloc") ;
 							if (todo != T_UNSET) log_usage(usage_env) ;
-							todo = T_REPLACE ; break ;
+							todo = T_REPLACE ;
+							break ;
 				case 'e' :	if (todo != T_UNSET) log_usage(usage_env) ;
-							todo = T_EDIT ; break ;
-				case 's' :	sym_switch = 1 ;
-							r = version_scan(&saversion,l.arg,SS_CONFIG_VERSION_NDOT) ;
-							if (r == -1) log_die_nomem("stralloc") ;
-							if (!r) log_die(LOG_EXIT_USER,"invalid version format") ;
+							todo = T_EDIT ;
+							break ;
+				case 'i' :	import = l.arg ;
 							break ;
-				case 'i' :	import = l.arg ; break ;
 				default : 	log_usage(usage_env) ; 
 			}
 		}
 		argc -= l.ind ; argv += l.ind ;
 	}
+
 	if (argc < 1) log_usage(usage_env) ;
 	sv = argv[0] ;
 
-	treename = !info->opt_tree ? 0 : info->treename.s ;
-
-	if (!src)
-	{
-		stralloc salink = STRALLOC_ZERO ;
-		r = ss_resolve_svtree(&sasrc,sv,treename) ;
-		if (r == -1) log_dieu(LOG_EXIT_SYS,"resolve tree source of sv: ",sv) ;
-		else if (!r) {
-			log_info("no tree exist yet") ;
-			goto freed ;
-		}
-		else if (r > 2) {
-			log_die(LOG_EXIT_SYS,sv," is set on different tree -- please use -t options") ;
-		}
-		else if (r == 1) log_die(LOG_EXIT_SYS,"unknown service: ",sv, !info->opt_tree ? " in current tree: " : " in tree: ", info->treename.s) ;
-
-		if (!ss_resolve_read(&res,sasrc.s,sv))
-			log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",sv) ;
+	if (todo == T_UNSET && !import && !saversion.len && !eversion.len) todo = T_EDIT ;
 
-		sasrc.len = 0 ;
+	treename = !info->opt_tree ? 0 : info->treename.s ;
 
-		if (!auto_stra(&sasrc,res.sa.s + res.srconf,SS_SYM_VERSION)) log_die_nomem("stralloc") ;
-		if (sareadlink(&salink,sasrc.s) == -1) log_dieusys(LOG_EXIT_SYS,"readlink: ",sasrc.s) ;
-		if (!stralloc_cats(&salink,"/") ||
-		!stralloc_cats(&salink,sv) ||
-		!stralloc_0(&salink) ||
-		!stralloc_copy(&sasrc,&salink)) log_die_nomem("stralloc") ;
-		src = sasrc.s ;
-		stralloc_free(&salink) ;
+	r = ss_resolve_svtree(&sasrc,sv,treename) ;
+	if (r == -1) log_dieu(LOG_EXIT_SYS,"resolve tree source of sv: ",sv) ;
+	else if (!r) {
+		log_info("no tree exist yet") ;
+		goto freed ;
+	}
+	else if (r > 2) {
+		log_die(LOG_EXIT_SYS,sv," is set on different tree -- please use -t options") ;
 	}
+	else if (r == 1) log_die(LOG_EXIT_SYS,"unknown service: ",sv, !info->opt_tree ? " in current tree: " : " in tree: ", info->treename.s) ;
 
-	if (!file_readputsa_g(&salist,src)) log_dieusys(LOG_EXIT_SYS,"read: ",src) ;
+	if (!ss_resolve_read(&res,sasrc.s,sv))
+		log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",sv) ;
 
-	satmp.len = 0 ;
+	svconf = res.sa.s + res.srconf ;
+	sasrc.len = 0 ;
 	
-	if (sym_switch)
+	if (saversion.len)
 	{
-		size_t conflen = strlen(res.sa.s + res.srconf) ;  
+		size_t conflen = strlen(svconf) ;
 		char sym[conflen + SS_SYM_VERSION_LEN + 1] ;
-		auto_strings(sym,res.sa.s + res.srconf,SS_SYM_VERSION) ;
-			
-		if (!stralloc_inserts(&saversion,0,"/") ||
-		!stralloc_inserts(&saversion,0,res.sa.s + res.srconf) ||
-		!stralloc_0(&saversion))
-			log_die_nomem("stralloc") ;
+		auto_strings(sym,svconf,SS_SYM_VERSION) ;
+
+		append_version(&saversion,svconf,saversion.s) ;
+
 		r = scan_mode(saversion.s,S_IFDIR) ;
 		if (r == -1 || !r) log_dieusys(LOG_EXIT_USER,"find the versioned directory: ",saversion.s) ; 
 
 		if (!atomic_symlink(saversion.s,sym,"ssexec_env"))
 			log_warnu_return(LOG_EXIT_ZERO,"symlink: ",sym," to: ",saversion.s) ;
+		log_info("symlink switched successfully to version: ",saversion.s) ;
 	}
 
 	if (import)
-		do_import(sv,res.sa.s + res.srconf,import) ;
+		do_import(sv,svconf,import) ;
 	
+	if (eversion.len)
+	{
+		append_version(&sasrc,svconf,eversion.s) ;
+		src = sasrc.s ;
+	}
+	else
+	{
+		if (!auto_stra(&sasrc,svconf,SS_SYM_VERSION)) log_die_nomem("stralloc") ;
+		if (sareadlink(&satmp,sasrc.s) == -1) log_dieusys(LOG_EXIT_SYS,"readlink: ",sasrc.s) ;
+		if (!stralloc_0(&satmp) ||
+		!stralloc_copy(&sasrc,&satmp)) log_die_nomem("stralloc") ;
+		src = sasrc.s ;
+	}
+
+	satmp.len = 0 ;
+
 	switch(todo)
 	{
+		case T_VLIST:
+			if (!sastr_dir_get(&satmp,svconf,SS_SYM_VERSION + 1,S_IFDIR))
+				log_dieu(LOG_EXIT_SYS,"get versioned directory of: ",svconf) ;
+			for (pos = 0 ; pos < satmp.len; pos += strlen(satmp.s + pos) + 1)
+			{
+				if (buffer_puts(buffer_1, satmp.s + pos) < 0)
+					log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
+				if (check_current_version(svconf,satmp.s + pos))
+					if (buffer_putsflush(buffer_1, " current") < 0)
+						log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
+				if (buffer_putsflush(buffer_1, "\n") < 0)
+					log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
+			}
+			break ;
 		case T_LIST:
-			if (buffer_putsflush(buffer_1, salist.s) < 0)
-				log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
+			if (!sastr_dir_get(&satmp,src,SS_SYM_VERSION + 1,S_IFREG))
+				log_dieu(LOG_EXIT_SYS,"get versioned directory at: ",src) ;
+			for (pos = 0 ; pos < satmp.len; pos += strlen(satmp.s + pos) + 1)
+			{
+				salist.len = 0 ;
+				char *name = satmp.s + pos ;
+				if (!file_readputsa(&salist,src,name)) log_dieusys(LOG_EXIT_SYS,"read: ",src,"/",name) ;
+				if (!stralloc_0(&salist)) log_die_nomem("stralloc") ;
+				log_info("contents of file: ",src,"/",name,"\n",salist.s) ;
+			}
 			break ;
 		case T_REPLACE:
+			if (!file_readputsa(&salist,src,sv)) log_dieusys(LOG_EXIT_SYS,"read: ",src,"/",sv) ;
 			if (!env_merge_conf(&satmp,&salist,&savar,2))
 				log_dieu(LOG_EXIT_SYS,"merge environment file with: ",savar.s) ;
-			if (!openwritenclose_unsafe(src,satmp.s,satmp.len))
-				log_dieusys(LOG_EXIT_SYS,"create file: ",src,sv) ;
+			salist.len = 0 ;
+			if (!auto_stra(&salist,src,"/",sv)) log_die_nomem("stralloc") ;
+			if (!openwritenclose_unsafe(salist.s,satmp.s,satmp.len))
+				log_dieusys(LOG_EXIT_SYS,"write file: ",sasrc.s) ;
 			break ;
 		case T_EDIT:
-			editor = getenv("EDITOR") ;
-			if (!editor) {
-				editor = getenv("SUDO_USER") ;
-				if (editor) log_dieu(LOG_EXIT_SYS,"get EDITOR with sudo command -- please try to use the -E sudo option e.g. sudo -E 66-env -e <service>") ;
-				else log_dieusys(LOG_EXIT_SYS,"get EDITOR") ;
-			}
-			char const *const newarg[3] = { editor, src, 0 } ;
-			xpathexec_run (newarg[0],newarg,envp) ;
-			break ;
+			salist.len = 0 ;
+			if (!auto_stra(&salist,src,"/",sv)) log_die_nomem("stralloc") ;
+			src = salist.s ;
+			run_editor(src,envp) ;
 		/** Can't happens */
 		default: break ;
 	}
@@ -251,6 +313,7 @@ int ssexec_env(int argc, char const *const *argv,char const *const *envp,ssexec_
 		stralloc_free(&satmp) ;
 		stralloc_free(&sasrc) ;
 		stralloc_free(&saversion) ;
+		stralloc_free(&eversion) ;
 		stralloc_free(&savar) ;
 		stralloc_free(&salist) ;
 		ss_resolve_free(&res) ;

src/lib66/ssexec_help.c

@@ -130,7 +130,7 @@ char const *help_svctl =
 "	-K: kill the service(s) and keep it down\n"
 ;
 
-char const *usage_env = "66-env [ -h ] [ -z ] [ -v verbosity ] [ -t tree ] [ -d dir ] [ -L ] [ -e ] [ -r key=value ] [ -s version ] [ -i src_version,dst_version ] service" ;
+char const *usage_env = "66-env [ -h ] [ -z ] [ -v verbosity ] [ -t tree ] [ -c version ] [ -s version ] [ -V|L ] [ -r key=value ] [ -i src,dst ] [ -e ] service" ;
 
 char const *help_env =
 "66-env <options> service\n"
@@ -140,10 +140,11 @@ char const *help_env =
 "	-z: use color\n"
 "	-v: increase/decrease verbosity\n"
 "	-t: tree to use\n"
-"	-L: list environment variable of service\n"
-"	-d: absolute path to the configuration service file\n"
+"	-c: set version as default\n"
+"	-s: specifies the version to handle\n"
+"	-V: lists available versioned configuration directories of the service\n"
+"	-L: lists the environment variables of the service\n"
 "	-r: replace the value of the key\n"
+"	-i: import configuration files from src version to dst version\n"
 "	-e: edit the file with EDITOR\n"
-"	-s: switch configuration symlink to version\n"
-"	-i: import configuration files from src_version to dst_version\n"
 ;