Skip to content
Snippets Groups Projects
Commit b577cc55 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

split resolve function

parent 7d5294f6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 958 additions and 30 deletions
src/include/66/ssexec.h
+ 13
− 1
View file @ b577cc55
...@@ -116,6 +116,8 @@ extern ssexec_func_t ssexec_reconfigure ; ...@@ -116,6 +116,8 @@ extern ssexec_func_t ssexec_reconfigure ;
extern ssexec_func_t ssexec_reload ; extern ssexec_func_t ssexec_reload ;
extern ssexec_func_t ssexec_restart ; extern ssexec_func_t ssexec_restart ;
extern ssexec_func_t ssexec_inresolve ; extern ssexec_func_t ssexec_inresolve ;
extern ssexec_func_t ssexec_resolve_service ;
extern ssexec_func_t ssexec_resolve_tree ;
extern ssexec_func_t ssexec_instate ; extern ssexec_func_t ssexec_instate ;
extern ssexec_func_t ssexec_intree ; extern ssexec_func_t ssexec_intree ;
extern ssexec_func_t ssexec_inservice ; extern ssexec_func_t ssexec_inservice ;
...@@ -123,6 +125,8 @@ extern ssexec_func_t ssexec_boot ; ...@@ -123,6 +125,8 @@ extern ssexec_func_t ssexec_boot ;
extern ssexec_func_t ssexec_scanctl ; extern ssexec_func_t ssexec_scanctl ;
extern ssexec_func_t ssexec_scandir ; extern ssexec_func_t ssexec_scandir ;
extern ssexec_func_t ssexec_tree_wrapper ; extern ssexec_func_t ssexec_tree_wrapper ;
extern ssexec_func_t ssexec_service_wrapper ;
extern ssexec_func_t ssexec_service_admin ;
extern char const *usage_parse ; extern char const *usage_parse ;
extern char const *help_parse ; extern char const *help_parse ;
...@@ -166,6 +170,10 @@ extern char const *usage_scanctl ; ...@@ -166,6 +170,10 @@ extern char const *usage_scanctl ;
extern char const *help_scanctl ; extern char const *help_scanctl ;
extern char const *usage_scandir ; extern char const *usage_scandir ;
extern char const *help_scandir ; extern char const *help_scandir ;
extern char const *usage_service_wrapper ;
extern char const *help_service_wrapper ;
extern char const *usage_service_admin ;
extern char const *help_service_admin ;
extern char const *usage_66 ; extern char const *usage_66 ;
#define OPTS_SUBSTART "P" #define OPTS_SUBSTART "P"
...@@ -176,7 +184,7 @@ extern char const *usage_66 ; ...@@ -176,7 +184,7 @@ extern char const *usage_66 ;
#define OPTS_INIT_LEN (sizeof OPTS_INIT - 1) #define OPTS_INIT_LEN (sizeof OPTS_INIT - 1)
#define OPTS_ENABLE "fFSI" #define OPTS_ENABLE "fFSI"
#define OPTS_ENABLE_LEN (sizeof OPTS_ENABLE - 1) #define OPTS_ENABLE_LEN (sizeof OPTS_ENABLE - 1)
#define OPTS_DISABLE "SFR" #define OPTS_DISABLE "S"
#define OPTS_DISABLE_LEN (sizeof OPTS_DISABLE - 1) #define OPTS_DISABLE_LEN (sizeof OPTS_DISABLE - 1)
#define OPTS_START "P" #define OPTS_START "P"
#define OPTS_START_LEN (sizeof OPTS_START - 1) #define OPTS_START_LEN (sizeof OPTS_START - 1)
...@@ -204,6 +212,10 @@ extern char const *usage_66 ; ...@@ -204,6 +212,10 @@ extern char const *usage_66 ;
#define OPTS_SCANCTL_LEN (sizeof OPTS_SCANCTL - 1) #define OPTS_SCANCTL_LEN (sizeof OPTS_SCANCTL - 1)
#define OPTS_SCANDIR "bl:s:o:L:cB" #define OPTS_SCANDIR "bl:s:o:L:cB"
#define OPTS_SCANDIR_LEN (sizeof OPTS_SCANDIR - 1) #define OPTS_SCANDIR_LEN (sizeof OPTS_SCANDIR - 1)
#define OPTS_SERVICE_WRAPPER ""
#define OPTS_SERVICE_WRAPPER_LEN (sizeof OPTS_SERVICE_WRAPPER - 1)
#define OPTS_SERVICE_ADMIN ""
#define OPTS_SERVICE_ADMIN_LEN (sizeof OPTS_SERVICE_ADMIN - 1)
......
src/lib66/exec/deps-lib/deps
+ 4
− 1
View file @ b577cc55
...@@ -6,21 +6,24 @@ ssexec_env.o ...@@ -6,21 +6,24 @@ ssexec_env.o
ssexec_free.o ssexec_free.o
ssexec_help.o ssexec_help.o
ssexec_init.o ssexec_init.o
ssexec_inresolve.o
ssexec_inservice.o ssexec_inservice.o
ssexec_instate.o ssexec_instate.o
ssexec_intree.o ssexec_intree.o
ssexec_parse.o ssexec_parse.o
ssexec_reconfigure.o ssexec_reconfigure.o
ssexec_reload.o ssexec_reload.o
ssexec_resolve_service.o
ssexec_resolve_tree.o
ssexec_restart.o ssexec_restart.o
ssexec_scanctl.o ssexec_scanctl.o
ssexec_scandir.o ssexec_scandir.o
ssexec_service_wrapper.o
ssexec_start.o ssexec_start.o
ssexec_stop.o ssexec_stop.o
ssexec_svctl.o ssexec_svctl.o
ssexec_tree.o ssexec_tree.o
ssexec_treectl.o ssexec_treectl.o
ssexec_service_admin.o
ssexec_tree_wrapper.o ssexec_tree_wrapper.o
-ls6 -ls6
-loblibs -loblibs
......
src/lib66/exec/ssexec_help.c
+ 57
− 5
View file @ b577cc55
...@@ -43,7 +43,7 @@ char const *help_enable = ...@@ -43,7 +43,7 @@ char const *help_enable =
" -S: enable and start the service\n" " -S: enable and start the service\n"
; ;
char const *usage_disable = "66 disable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] [ -F ] [ -R ] service(s)" ; char const *usage_disable = "66 disable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] service(s)" ;
char const *help_disable = char const *help_disable =
"\n" "\n"
...@@ -53,9 +53,7 @@ char const *help_disable = ...@@ -53,9 +53,7 @@ char const *help_disable =
" -v: increase/decrease verbosity\n" " -v: increase/decrease verbosity\n"
" -l: live directory\n" " -l: live directory\n"
" -t: name of the tree to use\n" " -t: name of the tree to use\n"
" -S: disable and stop the service\n" " -S: disable and stop/unsupervice the service if needed\n"
" -F: forces to disable the service\n"
" -R: disable the service and remove its configuration and logger files\n"
; ;
char const *usage_init = "66 init [ -h ] [ -z ] [ -v verbosity ] [ -l live ] tree" ; char const *usage_init = "66 init [ -h ] [ -z ] [ -v verbosity ] [ -l live ] tree" ;
...@@ -311,6 +309,60 @@ char const *help_inservice = ...@@ -311,6 +309,60 @@ char const *help_inservice =
" logfile: displays the contents of the log file\n" " logfile: displays the contents of the log file\n"
; ;
/**
*
* pass -g as default
* -d -g -p become -o depth=,graph=none,reverse=,nline=
*
*
* */
char const *usage_service_wrapper = "66 service [ -h ] [ -z ] [ -v verbosity ] [ -t tree ] status|resolve|state|remove [ -n ] [ -o name,intree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -p nline ] service" ;
char const *help_service_wrapper =
"\n"
"options :\n"
" -h: print this help\n"
" -z: use color\n"
" -v: increase/decrease verbosity\n"
" -n: do not display the field name\n"
" -o: comma separated list of field to display\n"
" -g: displays the contents field as graph\n"
" -d: limit the depth of the contents field recursion\n"
" -r: reverse the contents field\n"
" -t: only search service at the specified tree\n"
" -p: print n last lines of the log file\n"
"\n"
"valid fields for -o options are:\n"
"\n"
" name: displays the name\n"
" version: displays the version of the service\n"
" intree: displays the service's tree name\n"
" status: displays the status\n"
" type: displays the service type\n"
" description: displays the description\n"
" source: displays the source of the service's frontend file\n"
" live: displays the service's live directory\n"
" depends: displays the service's dependencies\n"
" requiredby: displays the service(s) which depends on service\n"
" extdepends: displays the service's external dependencies\n"
" optsdepends: displays the service's optional dependencies\n"
" start: displays the service's start script\n"
" stop: displays the service's stop script\n"
" envat: displays the source of the environment file\n"
" envfile: displays the contents of the environment file\n"
" logname: displays the logger's name\n"
" logdst: displays the logger's destination\n"
" logfile: displays the contents of the log file\n"
;
char const *usage_service_admin = "66 service remove [ -h ] service" ;
char const *help_service_admin =
"\n"
"options :\n"
" -h: print this help\n"
;
char const *usage_boot = "66 boot [ -h ] [ -z ] [ -m ] [ -s skel ] [ -l log_user ] [ -e environment ] [ -d dev ] [ -b banner ]" ; char const *usage_boot = "66 boot [ -h ] [ -z ] [ -m ] [ -s skel ] [ -l log_user ] [ -e environment ] [ -d dev ] [ -b banner ]" ;
char const *help_boot = char const *help_boot =
...@@ -358,4 +410,4 @@ char const *help_scandir = ...@@ -358,4 +410,4 @@ char const *help_scandir =
" -o: handles owner scandir\n" " -o: handles owner scandir\n"
; ;
char const *usage_66 = "66 start|stop|unsupervise|enable|disable|init|env|parse|svctl|tree|reconfigure|reload|restart|scanctl|scandir|boot service(s)|tree" ; char const *usage_66 = "66 start|stop|reload|restart|unsupervise|reconfigure|enable|disable|env|service|tree|init|parse|svctl|scanctl|scandir|boot|version service(s)|tree" ;
src/lib66/exec/ssexec_inresolve.c → src/lib66/exec/ssexec_resolve_service.c
+ 275
− 0
View file @ b577cc55
/* /*
* ssexec_inresolve.c * ssexec_resolve_service.c
* *
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org> * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
* *
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <66/resolve.h> #include <66/resolve.h>
#include <66/ssexec.h> #include <66/ssexec.h>
#include <66/tree.h>
#include <66/service.h> #include <66/service.h>
#include <66/info.h> #include <66/info.h>
#include <66/utils.h> #include <66/utils.h>
...@@ -35,35 +34,11 @@ ...@@ -35,35 +34,11 @@
#include <66/config.h> #include <66/config.h>
#include <66/state.h> #include <66/state.h>
#define MAXOPTS 84 #define MAXOPTS 70
static wchar_t const field_suffix[] = L" :" ; static wchar_t const field_suffix[] = L" :" ;
static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ; static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
static inline unsigned int lookup (char const *const *table, char const *data)
{
log_flow() ;
unsigned int i = 0 ;
for (; table[i] ; i++) if (!strcmp(data, table[i])) break ;
return i ;
}
static inline unsigned int parse_what (char const *str)
{
log_flow() ;
static char const *const table[] =
{
"service",
"tree",
0
} ;
unsigned int i = lookup(table, str) ;
if (!table[i]) i = 2 ;
return i ;
}
static void info_display_string(char const *field, char const *str, uint32_t element, uint8_t check) static void info_display_string(char const *field, char const *str, uint32_t element, uint8_t check)
{ {
info_display_field_name(field) ; info_display_field_name(field) ;
...@@ -181,268 +156,120 @@ static void info_display_service_field(resolve_service_t *res) ...@@ -181,268 +156,120 @@ static void info_display_service_field(resolve_service_t *res)
} }
int ssexec_inresolve(int argc, char const *const *argv, ssexec_t *info) int ssexec_resolve_service(int argc, char const *const *argv, ssexec_t *info)
{ {
int found = 0, what = 0 ; int r = 0 ;
uint8_t master = 0 ;
char const *svname = 0 ; char const *svname = 0 ;
char const *treename = info->treename.s ;
char atree[SS_MAX_TREENAME + 1] ; char atree[SS_MAX_TREENAME + 1] ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
argc-- ; argc-- ;
argv++ ; argv++ ;
if (argc < 2) log_usage(usage_inresolve) ; if (argc < 1)
what = parse_what(*argv) ;
if (what == 2)
log_usage(usage_inresolve) ; log_usage(usage_inresolve) ;
argv++;
argc--;
svname = *argv ; svname = *argv ;
if (!what) { char service_buf[MAXOPTS][INFO_FIELD_MAXLEN] = {
"name",
char service_buf[MAXOPTS][INFO_FIELD_MAXLEN] = { "description" ,
"name", "version",
"description" , "type",
"version", "notify",
"type", "maxdeath",
"notify", "earlier",
"maxdeath", "hiercopy",
"earlier", "intree",
"hiercopy", "ownerstr",
"intree", "owner",
"ownerstr", "treename",
"owner", "user" ,
"treename", "inmodule", // 14
"user" ,
"inmodule", // 14 "home",
"frontend",
"home", "tree",
"frontend", "status", //18
"tree",
"status", //18 "depends",
"requiredby",
"depends", "optsdeps",
"requiredby", "ndepends",
"optsdeps", "nrequiredby",
"ndepends", "noptsdeps", // 24
"nrequiredby",
"noptsdeps", // 24 "run",
"run_user",
"run", "run_build",
"run_user", "run_shebang",
"run_build", "run_runas",
"run_shebang", "finish",
"run_runas", "finish_user",
"finish", "finish_build",
"finish_user", "finish_shebang",
"finish_build", "finish_runas",
"finish_shebang", "timeoutkill",
"finish_runas", "timeoutfinish",
"timeoutkill", "timeoutup",
"timeoutfinish", "timeoutdown",
"timeoutup", "down",
"timeoutdown", "downsignal", // 40
"down",
"downsignal", // 40 "livedir",
"scandir",
"livedir", "statedir",
"scandir", "eventdir",
"statedir", "notifdir",
"eventdir", "supervisedir",
"notifdir", "fdholderdir",
"supervisedir", "oneshotddir", //48
"fdholderdir",
"oneshotddir", //48 "logname" ,
"logdestination" ,
"logname" , "logbackup" ,
"logdestination" , "logmaxsize" ,
"logbackup" , "logtimestamp" ,
"logmaxsize" , "logrun" ,
"logtimestamp" , "logrun_user" ,
"logrun" , "logrun_build" ,
"logrun_user" , "logrun_shebang" ,
"logrun_build" , "logrun_runas" ,
"logrun_shebang" , "logtimeoutkill",
"logrun_runas" , "logtimeoutfinish", // 60
"logtimeoutkill",
"logtimeoutfinish", // 60 "env",
"envdir",
"env", "env_overwrite", // 63
"envdir",
"env_overwrite", // 63 "configure",
"directories",
"configure", "files",
"directories", "infiles",
"files", "ndirectories",
"infiles", "nfiles",
"ndirectories", "ninfiles" // 70
"nfiles",
"ninfiles", // 70
"classic",
"bundle",
"oneshot",
"module",
"enabled",
"disabled",
"contents",
"nclassic",
"nbundle",
"noneshot",
"nmodule",
"nenabled",
"ndisabled",
"ncontents" // 84
} ;
resolve_wrapper_t_ref wres = 0 ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
resolve_service_master_t mres = RESOLVE_SERVICE_MASTER_ZERO ;
if (!strcmp(svname, SS_MASTER + 1)) {
master = 1 ;
wres = resolve_set_struct(DATA_SERVICE_MASTER, &mres) ;
} else {
wres = resolve_set_struct(DATA_SERVICE, &res) ;
}
if (!master) {
found = service_is_g(atree, svname, STATE_FLAGS_ISPARSED) ;
if (found == -1)
log_dieu(LOG_EXIT_SYS, "get information of service: ", svname, " -- please a bug report") ;
else if (!found)
log_die(LOG_EXIT_USER, svname, " is not parsed -- try to parse it first") ;
if (!resolve_read_g(wres, info->base.s, svname))
log_dieusys(LOG_EXIT_SYS,"read resolve file") ;
} else {
char solve[info->base.len + SS_SYSTEM_LEN + 1 + strlen(treename) + SS_SVDIRS_LEN + 1] ;
auto_strings(solve, info->base.s, SS_SYSTEM, "/", treename, SS_SVDIRS) ;
if (!resolve_read(wres, solve, SS_MASTER + 1))
log_dieusys(LOG_EXIT_SYS,"read resolve file") ;
}
info_field_align(service_buf, fields, field_suffix,MAXOPTS) ;
if (!master) {
info_display_service_field(&res) ;
} else {
info_display_string(fields[0], mres.sa.s, mres.name, 0) ;
info_display_string(fields[70], mres.sa.s, mres.classic, 1) ;
info_display_string(fields[71], mres.sa.s, mres.bundle, 1) ;
info_display_string(fields[72], mres.sa.s, mres.oneshot, 1) ;
info_display_string(fields[73], mres.sa.s, mres.module, 1) ;
info_display_string(fields[74], mres.sa.s, mres.enabled, 1) ;
info_display_string(fields[75], mres.sa.s, mres.disabled, 1) ;
info_display_string(fields[76], mres.sa.s, mres.contents, 1) ;
info_display_int(fields[77], mres.nclassic) ;
info_display_int(fields[78], mres.nbundle) ;
info_display_int(fields[79], mres.noneshot) ;
info_display_int(fields[80], mres.nmodule) ;
info_display_int(fields[81], mres.nenabled) ;
info_display_int(fields[82], mres.ndisabled) ;
info_display_int(fields[83], mres.ncontents) ;
}
resolve_free(wres) ;
} else { } ;
char tree_buf[MAXOPTS][INFO_FIELD_MAXLEN] = {
"name", r = service_is_g(atree, svname, STATE_FLAGS_ISPARSED) ;
"depends" , if (r == -1)
"requiredby", log_dieu(LOG_EXIT_SYS, "get information of service: ", svname, " -- please a bug report") ;
"allow", else if (!r)
"groups", log_die(LOG_EXIT_USER, svname, " is not parsed -- try to parse it first") ;
"contents",
"ndepends", if (!resolve_read_g(wres, info->base.s, svname))
"nrequiredby", log_dieusys(LOG_EXIT_SYS, "read resolve file") ;
"nallow",
"ngroups", info_field_align(service_buf, fields, field_suffix,MAXOPTS) ;
"ncontents",
"init" , info_display_service_field(&res) ;
"supervised",
"disen", // 14 resolve_free(wres) ;
// Master
"enabled",
"current",
"contents",
"nenabled",
"ncontents" // 19
} ;
resolve_wrapper_t_ref wres = 0 ;
resolve_tree_t tres = RESOLVE_TREE_ZERO ;
resolve_tree_master_t mres = RESOLVE_TREE_MASTER_ZERO ;
if (!strcmp(argv[0], SS_MASTER + 1)) {
master = 1 ;
wres = resolve_set_struct(DATA_TREE_MASTER, &mres) ;
} else {
wres = resolve_set_struct(DATA_TREE, &tres) ;
}
found = tree_isvalid(info->base.s, svname) ;
if (found < 0)
log_diesys(LOG_EXIT_SYS, "invalid tree directory") ;
if (!found)
log_dieusys(LOG_EXIT_SYS, "find tree: ", svname) ;
if (!resolve_read_g(wres, info->base.s, svname))
log_dieusys(LOG_EXIT_SYS, "read resolve file") ;
info_field_align(tree_buf, fields, field_suffix,MAXOPTS) ;
if (!master) {
info_display_string(fields[0], tres.sa.s, tres.name, 0) ;
info_display_string(fields[1], tres.sa.s, tres.depends, 1) ;
info_display_string(fields[2], tres.sa.s, tres.requiredby, 1) ;
info_display_string(fields[3], tres.sa.s, tres.allow, 1) ;
info_display_string(fields[4], tres.sa.s, tres.groups, 1) ;
info_display_string(fields[5], tres.sa.s, tres.contents, 1) ;
info_display_int(fields[6], tres.ndepends) ;
info_display_int(fields[7], tres.nrequiredby) ;
info_display_int(fields[8], tres.nallow) ;
info_display_int(fields[9], tres.ngroups) ;
info_display_int(fields[10], tres.ncontents) ;
info_display_int(fields[11], tres.init) ;
info_display_int(fields[12], tres.supervised) ;
info_display_int(fields[13], tres.disen) ;
} else {
info_display_string(fields[0], mres.sa.s, mres.name, 1) ;
info_display_string(fields[3], mres.sa.s, mres.allow, 1) ;
info_display_string(fields[14], mres.sa.s, mres.enabled, 1) ;
info_display_string(fields[15], mres.sa.s, mres.current, 1) ;
info_display_string(fields[16], mres.sa.s, mres.contents, 1) ;
info_display_int(fields[17], mres.nenabled) ;
info_display_int(fields[18], mres.ncontents) ;
}
resolve_free(wres) ;
}
return 0 ; return 0 ;
} }
src/lib66/exec/ssexec_resolve_tree.c 0 → 100644
+ 173
− 0
View file @ b577cc55
/*
* ssexec_resolve_tree.c
*
* Copyright (c) 2018-2021 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 <wchar.h>
#include <oblibs/log.h>
#include <oblibs/sastr.h>
#include <oblibs/string.h>
#include <oblibs/types.h>
#include <skalibs/types.h>
#include <skalibs/stralloc.h>
#include <skalibs/lolstdio.h>
#include <skalibs/buffer.h>
#include <66/resolve.h>
#include <66/ssexec.h>
#include <66/tree.h>
#include <66/info.h>
#include <66/utils.h>
#include <66/constants.h>
#include <66/config.h>
#include <66/state.h>
#define MAXOPTS 19
static wchar_t const field_suffix[] = L" :" ;
static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ;
static void info_display_string(char const *field, char const *str, uint32_t element, uint8_t check)
{
info_display_field_name(field) ;
if (check && !element) {
if (!bprintf(buffer_1,"%s%s", log_color->warning, "None"))
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
} else {
if (!buffer_puts(buffer_1, str + element))
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
}
if (buffer_putsflush(buffer_1, "\n") == -1)
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
}
static void info_display_int(char const *field, uint32_t element)
{
info_display_field_name(field) ;
char ui[UINT_FMT] ;
ui[uint_fmt(ui, element)] = 0 ;
if (!buffer_puts(buffer_1, ui))
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
if (buffer_putsflush(buffer_1, "\n") == -1)
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
}
int ssexec_resolve_tree(int argc, char const *const *argv, ssexec_t *info)
{
int r = 0 ;
uint8_t master = 0 ;
char const *svname = 0 ;
char const *treename = info->treename.s ;
resolve_wrapper_t_ref wres = 0 ;
resolve_tree_t tres = RESOLVE_TREE_ZERO ;
resolve_tree_master_t mres = RESOLVE_TREE_MASTER_ZERO ;
argc-- ;
argv++ ;
if (argc < 1)
log_usage(usage_inresolve) ;
svname = *argv ;
char tree_buf[MAXOPTS][INFO_FIELD_MAXLEN] = {
"name",
"depends" ,
"requiredby",
"allow",
"groups",
"contents",
"ndepends",
"nrequiredby",
"nallow",
"ngroups",
"ncontents",
"init" ,
"supervised",
"disen", // 14
// Master
"enabled",
"current",
"contents",
"nenabled",
"ncontents" // 19
} ;
if (!strcmp(argv[0], SS_MASTER + 1)) {
master = 1 ;
wres = resolve_set_struct(DATA_TREE_MASTER, &mres) ;
} else {
wres = resolve_set_struct(DATA_TREE, &tres) ;
}
r = tree_isvalid(info->base.s, svname) ;
if (r < 0)
log_diesys(LOG_EXIT_SYS, "invalid tree directory") ;
if (!r)
log_dieusys(LOG_EXIT_SYS, "find tree: ", svname) ;
if (!resolve_read_g(wres, info->base.s, svname))
log_dieusys(LOG_EXIT_SYS, "read resolve file") ;
info_field_align(tree_buf, fields, field_suffix,MAXOPTS) ;
if (!master) {
info_display_string(fields[0], tres.sa.s, tres.name, 0) ;
info_display_string(fields[1], tres.sa.s, tres.depends, 1) ;
info_display_string(fields[2], tres.sa.s, tres.requiredby, 1) ;
info_display_string(fields[3], tres.sa.s, tres.allow, 1) ;
info_display_string(fields[4], tres.sa.s, tres.groups, 1) ;
info_display_string(fields[5], tres.sa.s, tres.contents, 1) ;
info_display_int(fields[6], tres.ndepends) ;
info_display_int(fields[7], tres.nrequiredby) ;
info_display_int(fields[8], tres.nallow) ;
info_display_int(fields[9], tres.ngroups) ;
info_display_int(fields[10], tres.ncontents) ;
info_display_int(fields[11], tres.init) ;
info_display_int(fields[12], tres.supervised) ;
info_display_int(fields[13], tres.disen) ;
} else {
info_display_string(fields[0], mres.sa.s, mres.name, 1) ;
info_display_string(fields[3], mres.sa.s, mres.allow, 1) ;
info_display_string(fields[14], mres.sa.s, mres.enabled, 1) ;
info_display_string(fields[15], mres.sa.s, mres.current, 1) ;
info_display_string(fields[16], mres.sa.s, mres.contents, 1) ;
info_display_int(fields[17], mres.nenabled) ;
info_display_int(fields[18], mres.ncontents) ;
}
resolve_free(wres) ;
return 0 ;
}
src/lib66/exec/ssexec_service_admin.c 0 → 100644
+ 184
− 0
View file @ b577cc55
/*
* ssexec_service_admin.c
*
* Copyright (c) 2018-2021 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 <oblibs/log.h>
#include <skalibs/sgetopt.h>
#include <66/ssexec.h>
#include <66/config.h>
static inline void info_help (char const *help,char const *usage)
{
log_flow() ;
DEFAULT_MSG = 0 ;
log_info(usage,"\n", help) ;
}
int ssexec_service_admin(int argc, char const *const *argv, ssexec_t *info)
{
log_flow() ;
if (!argv[1]) {
PROG = "service" ;
log_usage(usage_service_wrapper) ;
}
int r, n = 0, i = 0 ;
uint8_t ctl = 0 ;
ssexec_func_t_ref func = 0 ;
char const *nargv[argc + 1] ;
if (!strcmp(argv[1], "status")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_inservice ;
info->usage = usage_inservice ;
func = &ssexec_inservice ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "resolve")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_inresolve ;
info->usage = usage_inresolve ;
func = &ssexec_resolve_service ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "state")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_instate ;
info->usage = usage_instate ;
func = &ssexec_instate ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "remove")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_instate ;
info->usage = usage_instate ;
func = &ssexec_service_admin ;
argc-- ;
argv++ ;
} else {
log_usage(usage_tree) ;
}
{
subgetopt l = SUBGETOPT_ZERO ;
int f = 0 ;
for (;;) {
int opt = subgetopt_r(argc, argv, "-h", &l) ;
if (opt == -1) break ;
switch (opt) {
case 'h' :
info_help(info->help, info->usage) ;
return 0 ;
default:
for (i = 0 ; i < n ; i++) {
if (!argv[l.ind])
log_usage(info->usage) ;
if (l.arg) {
if (!strcmp(nargv[i],argv[l.ind - 2]) || !strcmp(nargv[i],l.arg))
f = 1 ;
} else {
if (!strcmp(nargv[i],argv[l.ind]))
f = 1 ;
}
}
if (!f) {
if (l.arg) {
// distinction between e.g -enano and -e nano
if (argv[l.ind - 1][0] != '-')
nargv[n++] = argv[l.ind - 2] ;
nargv[n++] = argv[l.ind - 1] ;
} else {
nargv[n++] = argv[l.ind] ;
}
}
f = 0 ;
break ;
}
}
argc -= l.ind ; argv += l.ind ;
}
for (i = 0 ; i < argc ; i++ , argv++)
nargv[n++] = *argv ;
nargv[n] = 0 ;
if (ctl) {
/* swap the command and options e.g.
* down -f <treename> <-> -f down <treename> */
if (n > 2) {
/* swap the command and options e.g.
* down -f <-> -f down */
nargv[n] = nargv[n-1] ;
nargv[n-1] = nargv[0] ;
nargv[++n] = 0 ;
} else if (nargv[n-1][0] == '-') {
nargv[n++] = nargv[0] ;
nargv[n] = 0 ;
} else {
nargv[n] = nargv[n-1] ;
nargv[n-1] = nargv[0] ;
nargv[++n] = 0 ;
}
}
r = (*func)(n, nargv, info) ;
return r ;
}
src/lib66/exec/ssexec_service_wrapper.c 0 → 100644
+ 184
− 0
View file @ b577cc55
/*
* ssexec_service_wrapper.c
*
* Copyright (c) 2018-2021 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 <oblibs/log.h>
#include <skalibs/sgetopt.h>
#include <66/ssexec.h>
#include <66/config.h>
static inline void info_help (char const *help,char const *usage)
{
log_flow() ;
DEFAULT_MSG = 0 ;
log_info(usage,"\n", help) ;
}
int ssexec_service_wrapper(int argc, char const *const *argv, ssexec_t *info)
{
log_flow() ;
if (!argv[1]) {
PROG = "service" ;
log_usage(usage_service_wrapper) ;
}
int r, n = 0, i = 0 ;
uint8_t ctl = 0 ;
ssexec_func_t_ref func = 0 ;
char const *nargv[argc + 1] ;
if (!strcmp(argv[1], "status")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_inservice ;
info->usage = usage_inservice ;
func = &ssexec_inservice ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "resolve")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_inresolve ;
info->usage = usage_inresolve ;
func = &ssexec_resolve_service ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "state")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_instate ;
info->usage = usage_instate ;
func = &ssexec_instate ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "remove")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_instate ;
info->usage = usage_instate ;
func = &ssexec_service_admin ;
argc-- ;
argv++ ;
} else {
log_usage(usage_tree) ;
}
{
subgetopt l = SUBGETOPT_ZERO ;
int f = 0 ;
for (;;) {
int opt = subgetopt_r(argc, argv, "-h", &l) ;
if (opt == -1) break ;
switch (opt) {
case 'h' :
info_help(info->help, info->usage) ;
return 0 ;
default:
for (i = 0 ; i < n ; i++) {
if (!argv[l.ind])
log_usage(info->usage) ;
if (l.arg) {
if (!strcmp(nargv[i],argv[l.ind - 2]) || !strcmp(nargv[i],l.arg))
f = 1 ;
} else {
if (!strcmp(nargv[i],argv[l.ind]))
f = 1 ;
}
}
if (!f) {
if (l.arg) {
// distinction between e.g -enano and -e nano
if (argv[l.ind - 1][0] != '-')
nargv[n++] = argv[l.ind - 2] ;
nargv[n++] = argv[l.ind - 1] ;
} else {
nargv[n++] = argv[l.ind] ;
}
}
f = 0 ;
break ;
}
}
argc -= l.ind ; argv += l.ind ;
}
for (i = 0 ; i < argc ; i++ , argv++)
nargv[n++] = *argv ;
nargv[n] = 0 ;
if (ctl) {
/* swap the command and options e.g.
* down -f <treename> <-> -f down <treename> */
if (n > 2) {
/* swap the command and options e.g.
* down -f <-> -f down */
nargv[n] = nargv[n-1] ;
nargv[n-1] = nargv[0] ;
nargv[++n] = 0 ;
} else if (nargv[n-1][0] == '-') {
nargv[n++] = nargv[0] ;
nargv[n] = 0 ;
} else {
nargv[n] = nargv[n-1] ;
nargv[n-1] = nargv[0] ;
nargv[++n] = 0 ;
}
}
r = (*func)(n, nargv, info) ;
return r ;
}
src/lib66/exec/ssexec_tree_wrapper.c
+ 68
− 23
View file @ b577cc55
/* /*
* ssexec_reload.c * ssexec_tree_wrapper.c
* *
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org> * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
* *
...@@ -21,6 +21,15 @@ ...@@ -21,6 +21,15 @@
#include <66/ssexec.h> #include <66/ssexec.h>
#include <66/config.h> #include <66/config.h>
static inline void info_help (char const *help,char const *usage)
{
log_flow() ;
DEFAULT_MSG = 0 ;
log_info(usage,"\n", help) ;
}
int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info) int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
{ {
log_flow() ; log_flow() ;
...@@ -113,6 +122,32 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info) ...@@ -113,6 +122,32 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
argc-- ; argc-- ;
argv++ ; argv++ ;
} else if (!strcmp(argv[1], "resolve")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_inresolve ;
info->usage = usage_inresolve ;
func = &ssexec_resolve_tree ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "status")) {
nargv[n++] = PROG ;
info->prog = PROG ;
info->help = help_intree ;
info->usage = usage_intree ;
func = &ssexec_intree ;
argc-- ;
argv++ ;
} else if (!strcmp(argv[1], "up")) { } else if (!strcmp(argv[1], "up")) {
info->prog = PROG ; info->prog = PROG ;
...@@ -148,41 +183,51 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info) ...@@ -148,41 +183,51 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
int f = 0 ; int f = 0 ;
for (;;) { for (;;) {
int opt = subgetopt_r(argc, argv, "", &l) ; int opt = subgetopt_r(argc, argv, "-h", &l) ;
if (opt == -1) break ; if (opt == -1) break ;
switch (opt) {
for (i = 0 ; i < n ; i++) { case 'h' :
if (!argv[l.ind]) info_help(info->help, info->usage) ;
log_usage(info->usage) ; return 0 ;
if (l.arg) { default:
if (!strcmp(nargv[i],argv[l.ind - 2]) || !strcmp(nargv[i],l.arg)) for (i = 0 ; i < n ; i++) {
f = 1 ;
} else { if (!argv[l.ind])
log_usage(info->usage) ;
if (!strcmp(nargv[i],argv[l.ind])) if (l.arg) {
f = 1 ;
} if (!strcmp(nargv[i],argv[l.ind - 2]) || !strcmp(nargv[i],l.arg))
} f = 1 ;
} else {
if (!strcmp(nargv[i],argv[l.ind]))
f = 1 ;
}
}
if (!f) { if (!f) {
if (l.arg) { if (l.arg) {
// distinction between e.g -enano and -e nano // distinction between e.g -enano and -e nano
if (argv[l.ind - 1][0] != '-') if (argv[l.ind - 1][0] != '-')
nargv[n++] = argv[l.ind - 2] ; nargv[n++] = argv[l.ind - 2] ;
nargv[n++] = argv[l.ind - 1] ; nargv[n++] = argv[l.ind - 1] ;
} else { } else {
nargv[n++] = argv[l.ind] ; nargv[n++] = argv[l.ind] ;
} }
}
f = 0 ;
break ;
} }
f = 0 ;
} }
argc -= l.ind ; argv += l.ind ; argc -= l.ind ; argv += l.ind ;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment