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

add nofield features at 66-in{tree,service}

parent de850f0c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/66/66-inservice.c
+ 50
− 42
View file @ a5bccc50
......@@ -46,6 +46,7 @@
#include <s6/s6-supervise.h>
static unsigned int REVERSE = 0 ;
static unsigned int NOFIELD = 1 ;
unsigned int MAXDEPTH = 1 ;
static unsigned int GRAPH = 0 ;
static char const *const *ENVP ;
......@@ -99,7 +100,7 @@ info_opts_map_t const opts_sv_table[] =
#define checkopts(n) if (n >= MAXOPTS) strerr_dief1x(100, "too many options")
#define DELIM ','
#define USAGE "66-inservice [ -h ] [ -v verbosity ] [ -c ] [ -o name,instree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] service"
#define USAGE "66-inservice [ -h ] [ -v verbosity ] [ -c ] [ -n ] [ -o name,instree,status,... ] [ -g ] [ -d depth ] [ -r ] [ -t tree ] [ -p nline ] service"
static inline void info_help (void)
{
......@@ -110,6 +111,7 @@ static inline void info_help (void)
" -h: print this help\n"
" -v: increase/decrease verbosity\n"
" -c: use color\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"
......@@ -177,7 +179,7 @@ char *print_nlog(char *str, int n)
static void info_display_string(char const *str)
{
if (!bprintf(buffer_1," %s",str))
if (!bprintf(buffer_1,"%s",str))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") == -1)
......@@ -186,13 +188,13 @@ static void info_display_string(char const *str)
static void info_display_name(char const *field, ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->name) ;
}
static void info_display_intree(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->treename) ;
}
......@@ -208,7 +210,7 @@ static void info_get_status(ss_resolve_t *res)
r = s6_svc_ok(res->sa.s + res->runat) ;
if (r != 1)
{
if (!bprintf(buffer_1,"%s%s%s",log_color->warning,"not running\n",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
return ;
}
......@@ -228,7 +230,7 @@ static void info_get_status(ss_resolve_t *res)
}
else
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"nothing to display",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
}
......@@ -236,9 +238,9 @@ static void info_get_status(ss_resolve_t *res)
static void info_display_status(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
if (!bprintf(buffer_1," %s%s%s%s",res->disen ? log_color->valid : log_color->error,res->disen ? "enabled" : "disabled",log_color->off,", "))
if (!bprintf(buffer_1,"%s%s%s%s",res->disen ? log_color->valid : log_color->error,res->disen ? "enabled" : "disabled",log_color->off,", "))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"") == -1)
......@@ -250,25 +252,25 @@ static void info_display_status(char const *field,ss_resolve_t *res)
static void info_display_type(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(get_keybyid(res->type)) ;
}
static void info_display_description(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->description) ;
}
static void info_display_source(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->src) ;
}
static void info_display_live(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->runat) ;
}
......@@ -278,13 +280,14 @@ static void info_display_deps(char const *field, ss_resolve_t *res)
stralloc salist = STRALLOC_ZERO ;
padding = info_display_field_name(field) ;
if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; }
if (!res->ndeps) goto empty ;
if (GRAPH)
{
if (!bprintf(buffer_1," %s\n","/"))
if (!bprintf(buffer_1,"%s\n","/"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!info_graph_init(res,src.s,REVERSE, padding, STYLE))
......@@ -293,8 +296,8 @@ static void info_display_deps(char const *field, ss_resolve_t *res)
}
else
{
if (!bprintf(buffer_1,"%s"," "))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
//if (!bprintf(buffer_1,"%s"," "))
// log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!sastr_clean_string(&salist,res->sa.s + res->deps))
log_dieu(LOG_EXIT_SYS,"build dependencies list") ;
if (REVERSE)
......@@ -306,14 +309,14 @@ static void info_display_deps(char const *field, ss_resolve_t *res)
empty:
if (GRAPH)
{
if (!bprintf(buffer_1," %s\n","/"))
if (!bprintf(buffer_1,"%s\n","/"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!bprintf(buffer_1,"%*s%s%s%s%s\n",padding, "", STYLE->last, log_color->warning," no dependencies",log_color->off))
if (!bprintf(buffer_1,"%*s%s%s%s%s\n",padding, "", STYLE->last, log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
else
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," no dependencies",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
......@@ -325,13 +328,13 @@ static void info_display_optsdeps(char const *field, ss_resolve_t *res)
{
stralloc salist = STRALLOC_ZERO ;
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
else field = 0 ;
if (!res->noptsdeps) goto empty ;
if (!bprintf(buffer_1,"%s"," "))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
//if (!bprintf(buffer_1,"%s"," "))
// log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!sastr_clean_string(&salist,res->sa.s + res->optsdeps))
log_dieu(LOG_EXIT_SYS,"build dependencies list") ;
if (REVERSE)
......@@ -341,7 +344,7 @@ static void info_display_optsdeps(char const *field, ss_resolve_t *res)
goto freed ;
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," no optional dependencies",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
freed:
......@@ -350,28 +353,30 @@ static void info_display_optsdeps(char const *field, ss_resolve_t *res)
static void info_display_start(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
else field = 0 ;
if (res->exec_run)
{
info_display_nline(field,res->sa.s + res->exec_run) ;
}
else
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," nothing to display",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
}
static void info_display_stop(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
else field = 0 ;
if (res->exec_finish)
{
info_display_nline(field,res->sa.s + res->exec_finish) ;
}
else
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," nothing to display",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
......@@ -379,7 +384,7 @@ static void info_display_stop(char const *field,ss_resolve_t *res)
static void info_display_envat(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
char *name = res->sa.s + res->name ;
if (!res->srconf) goto empty ;
{
......@@ -396,13 +401,15 @@ static void info_display_envat(char const *field,ss_resolve_t *res)
}
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," environment was not set",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
static void info_display_envfile(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
else field = 0 ;
if (!res->srconf) goto empty ;
{
stralloc sa = STRALLOC_ZERO ;
......@@ -414,13 +421,13 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
return ;
}
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," environment was not set",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
static void info_display_logname(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
if (res->type == CLASSIC || res->type == LONGRUN)
{
if (res->logger)
......@@ -433,13 +440,13 @@ static void info_display_logname(char const *field,ss_resolve_t *res)
return ;
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," logger doesn't exist",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
static void info_display_logdst(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
if (res->type == CLASSIC || res->type == LONGRUN)
{
if (res->logger)
......@@ -452,13 +459,13 @@ static void info_display_logdst(char const *field,ss_resolve_t *res)
return ;
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," logger doesn't exist",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
static void info_display_logfile(char const *field,ss_resolve_t *res)
{
info_display_field_name(field) ;
if (NOFIELD) info_display_field_name(field) ;
if (res->type == CLASSIC || res->type == LONGRUN)
{
if (res->logger)
......@@ -477,7 +484,7 @@ static void info_display_logfile(char const *field,ss_resolve_t *res)
if (r < 0) { errno = EEXIST ; log_diesys(LOG_EXIT_SYS,"conflicting format of: ",scan) ; }
if (!r)
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->error," unable to find the log file",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->error,"unable to find the log file",log_color->off))
goto err ;
}
else
......@@ -485,7 +492,7 @@ static void info_display_logfile(char const *field,ss_resolve_t *res)
if (!file_readputsa(&log,res->sa.s + res->dstlog,"current")) log_dieusys(LOG_EXIT_SYS,"read log file of: ",res->sa.s + res->name) ;
if (log.len < 10)
{
if (!bprintf(buffer_1,"%s%s%s",log_color->warning," log file is empty \n",log_color->off)) goto err ;
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off)) goto err ;
}
else
{
......@@ -501,7 +508,7 @@ static void info_display_logfile(char const *field,ss_resolve_t *res)
return ;
empty:
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," logger doesn't exist",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning,"None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
return ;
err:
......@@ -594,7 +601,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
for (;;)
{
int opt = getopt_args(argc,argv, ">hv:co:grd:t:p:", &l) ;
int opt = getopt_args(argc,argv, ">hv:cno:grd:t:p:", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
......@@ -602,6 +609,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
case 'h' : info_help(); return 0 ;
case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) log_usage(USAGE) ; break ;
case 'c' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'n' : NOFIELD = 0 ; break ;
case 'o' : legacy = 0 ; info_parse_options(l.arg,what) ; break ;
case 'g' : GRAPH = 1 ; break ;
case 'r' : REVERSE = 1 ; break ;
......@@ -681,7 +689,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
}
else
{
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," nothing to display",log_color->off))
if (!bprintf(buffer_1,"%s%s%s\n",log_color->warning," None",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") < 0)
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
......
src/66/66-intree.c
+ 21
− 17
View file @ a5bccc50
......@@ -39,6 +39,7 @@
#include <66/resolve.h>
static unsigned int REVERSE = 0 ;
static unsigned int NOFIELD = 1 ;
unsigned int MAXDEPTH = 1 ;
static unsigned int GRAPH = 0 ;
static uid_t OWNER ;
......@@ -71,7 +72,7 @@ info_opts_map_t const opts_tree_table[] =
#define checkopts(n) if (n >= MAXOPTS) log_die(100, "too many options")
#define DELIM ','
#define USAGE "66-intree [ -h ] [ -v verbosity ] [ -l live ] [ -c ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] tree"
#define USAGE "66-intree [ -h ] [ -v verbosity ] [ -l live ] [ -c ] [ -n ] [ -o name,init,enabled,... ] [ -g ] [ -d depth ] [ -r ] tree"
static inline void info_help (void)
{
......@@ -83,6 +84,7 @@ static inline void info_help (void)
" -v: increase/decrease verbosity\n"
" -l: live directory\n"
" -c: use color\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"
......@@ -138,8 +140,8 @@ static int info_cmpnsort(stralloc *sa)
static void info_display_name(char const *field, char const *treename)
{
info_display_field_name(field) ;
if (!bprintf(buffer_1," %s",treename))
if (NOFIELD) info_display_field_name(field) ;
if (!bprintf(buffer_1,"%s",treename))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") == -1)
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
......@@ -161,8 +163,8 @@ static void info_display_init(char const *field,char const *treename)
!stralloc_0(&live)) log_die_nomem("stralloc") ;
if (!access(live.s, F_OK)) init = 1 ;
info_display_field_name(field) ;
if (!bprintf(buffer_1," %s%s%s",init ? log_color->valid : log_color->warning, init ? "yes":"no",log_color->off))
if (NOFIELD) info_display_field_name(field) ;
if (!bprintf(buffer_1,"%s%s%s",init ? log_color->valid : log_color->warning, init ? "yes":"no",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") == -1)
......@@ -181,8 +183,8 @@ static void info_display_current(char const *field,char const *treename)
if (!basename(name,sacurr.s)) log_dieu(LOG_EXIT_SYS,"basename of: ",sacurr.s) ;
current = obstr_equal(treename,name) ;
}
info_display_field_name(field) ;
if (!bprintf(buffer_1," %s%s%s", current ? log_color->blink : log_color->warning, current ? "yes":"no",log_color->off))
if (NOFIELD) info_display_field_name(field) ;
if (!bprintf(buffer_1,"%s%s%s", current ? log_color->blink : log_color->warning, current ? "yes":"no",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") == -1)
......@@ -194,8 +196,8 @@ static void info_display_current(char const *field,char const *treename)
static void info_display_enabled(char const *field,char const *treename)
{
int enabled = tree_cmd_state(VERBOSITY,"-s",treename) ;
info_display_field_name(field) ;
if (!bprintf(buffer_1," %s%s%s",enabled == 1 ? log_color->valid : log_color->warning, enabled == 1 ? "yes":"no",log_color->off))
if (NOFIELD) info_display_field_name(field) ;
if (!bprintf(buffer_1,"%s%s%s",enabled == 1 ? log_color->valid : log_color->warning, enabled == 1 ? "yes":"no",log_color->off))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (buffer_putsflush(buffer_1,"\n") == -1)
......@@ -249,7 +251,8 @@ static void info_display_contents(char const *field, char const *treename)
info_get_graph_src(&graph,tmp,0) ;
padding = info_display_field_name(field) ;
if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; }
if (!genalloc_len(ss_resolve_t,&graph.name)) goto empty ;
......@@ -266,7 +269,7 @@ static void info_display_contents(char const *field, char const *treename)
if (GRAPH)
{
if (!bprintf(buffer_1," %s\n","/"))
if (!bprintf(buffer_1,"%s\n","/"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
size_t el = sastr_len(&salist) ;
if (!sastr_rebuild_in_oneline(&salist)) log_dieu(LOG_EXIT_SYS,"rebuild dependencies list") ;
......@@ -279,8 +282,8 @@ static void info_display_contents(char const *field, char const *treename)
}
else
{
if (!bprintf(buffer_1,"%s"," "))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
//if (!bprintf(buffer_1,"%s"," "))
//log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (REVERSE)
if (!sastr_reverse(&salist))
log_dieusys(LOG_EXIT_SYS,"reverse dependencies list") ;
......@@ -290,14 +293,14 @@ static void info_display_contents(char const *field, char const *treename)
empty:
if (GRAPH)
{
if (!bprintf(buffer_1," %s\n","/"))
if (!bprintf(buffer_1,"%s\n","/"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!bprintf(buffer_1,"%*s%s%s",padding,"",STYLE->last," empty tree"))
if (!bprintf(buffer_1,"%*s%s%s",padding,"",STYLE->last,"None"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
else
{
if (!bprintf(buffer_1,"%s"," empty tree"))
if (!bprintf(buffer_1,"%s","None"))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
if (buffer_putsflush(buffer_1,"\n") == -1)
......@@ -380,7 +383,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
for (;;)
{
int opt = getopt_args(argc,argv, ">hv:co:grd:l:", &l) ;
int opt = getopt_args(argc,argv, ">hv:cno:grd:l:", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
......@@ -388,6 +391,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
case 'h' : info_help(); return 0 ;
case 'v' : if (!uint0_scan(l.arg, &VERBOSITY)) log_usage(USAGE) ; break ;
case 'c' : log_color = !isatty(1) ? &log_color_disable : &log_color_enable ; break ;
case 'n' : NOFIELD = 0 ; break ;
case 'o' : legacy = 0 ; info_parse_options(l.arg,what) ; break ;
case 'g' : GRAPH = 1 ; break ;
case 'r' : REVERSE = 1 ; break ;
......
src/lib66/ss_info_utils.c
+ 7
− 9
View file @ a5bccc50
......@@ -123,7 +123,7 @@ size_t info_display_field_name(char const *field)
if(field)
{
len = info_length_from_wchar(field) + 1 ;
if (!bprintf(buffer_1,"%s%s%s", log_color->info, field, log_color->off)) log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (!bprintf(buffer_1,"%s%s%s ", log_color->info, field, log_color->off)) log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
return len ;
}
......@@ -177,15 +177,13 @@ void info_display_nline(char const *field,char const *str)
cp.len = 0 ;
if (!stralloc_cats(&cp,tmp.s + pos) ||
!stralloc_0(&cp)) log_die_nomem("stralloc") ;
if (!pos)
if (field)
{
if (!bprintf(buffer_1,"%s"," "))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
else
{
if (!bprintf(buffer_1,"%*s",padding,""))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
if (pos)
{
if (!bprintf(buffer_1,"%*s",padding,""))
log_dieusys(LOG_EXIT_SYS,"write to stdout") ;
}
}
info_display_list(field,&cp) ;
}
......
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