regress to previous state

src/66/66-all.c

@@ -67,32 +67,26 @@ int doit(char const *tree,char const *treename,char const *live, unsigned int wh
 	
 	genalloc ga = GENALLOC_ZERO ; //stralist
 	
-	char ownerstr[256] ;
-	size_t ownerlen = uid_fmt(ownerstr,owner) ;
-	ownerstr[ownerlen] = 0 ;
-	
-	size_t livelen = strlen(live) - 1 ;
-	size_t treenamelen = strlen(treename) ;
-	char src[livelen + SS_STATE_LEN + 1 + ownerlen + 1 + treenamelen + SS_RESOLVE_LEN + 1] ;
-	memcpy(src,live,livelen) ;
-	memcpy(src + livelen, SS_STATE,SS_STATE_LEN) ;
-	src[livelen + SS_STATE_LEN] = '/' ;
-	memcpy(src + livelen + SS_STATE_LEN + 1,ownerstr,ownerlen) ;
-	src[livelen + SS_STATE_LEN + 1 + ownerlen] = '/' ;
-	memcpy(src + livelen + SS_STATE_LEN + 1 + ownerlen + 1,treename,treenamelen) ;
-	memcpy(src + livelen + SS_STATE_LEN + 1 + ownerlen + 1 + treenamelen, SS_RESOLVE,SS_RESOLVE_LEN) ;
-	src[livelen + SS_STATE_LEN + 1 + ownerlen + 1 + treenamelen + SS_RESOLVE_LEN] = 0 ;
-	
-	if (!dir_get(&ga,src,SS_MASTER+1,S_IFREG))
+	size_t treelen = strlen(tree) ;
+    
+    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_IFREG))
 	{
-		VERBO3 strerr_warnwu2x("find source of service for tree: ",treename) ;
+		VERBO3 strerr_warnwu2x("find source of classic service for tree: ",treename) ;
 		goto err ;
 	}
-	if (!genalloc_len(stralist,&ga))
+	/** add transparent Master to start the db*/
+	if (!stra_add(&ga,SS_MASTER+1))
 	{
-		VERBO3 strerr_warni4x("no services for tree: ",treename," to ", what ? "start" : "stop") ;
+		VERBO3 strerr_warnwu2x("add inner bundle as service to ", what ? "start" : "stop") ;
+		goto err ;
 	}
-	
+
 	{
 		char const *newargv[10 + genalloc_len(stralist,&ga)] ;
 		unsigned int m = 0 ;