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

remove empty value

parent 6288a316
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <66/enum.h> #include <66/enum.h>
#include <66/utils.h> #include <66/utils.h>
#include <stdio.h>
int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
{ {
int r = 0, e = 0 ; int r = 0, e = 0 ;
...@@ -201,7 +203,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -201,7 +203,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
{
if (sa.len) {
size_t len = sa.len ; size_t len = sa.len ;
char t[len + 1] ; char t[len + 1] ;
...@@ -215,12 +219,13 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -215,12 +219,13 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!auto_stra(&sa, t + pos, " ")) if (!auto_stra(&sa, t + pos, " "))
goto err ; goto err ;
} }
}
sa.len-- ;
if (!stralloc_0(&sa))
goto err ;
res->hiercopy = resolve_add_string(wres, sa.s) ; sa.len-- ;
if (!stralloc_0(&sa))
goto err ;
res->hiercopy = resolve_add_string(wres, sa.s) ;
}
break ; break ;
...@@ -231,7 +236,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -231,7 +236,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
{
if (sa.len) {
pos = 0 ; pos = 0 ;
FOREACH_SASTR(&sa, pos) { FOREACH_SASTR(&sa, pos) {
...@@ -258,7 +265,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -258,7 +265,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
{ if (sa.len) {
uid_t user[256] ; uid_t user[256] ;
memset(user, 0, 256*sizeof(uid_t)) ; memset(user, 0, 256*sizeof(uid_t)) ;
...@@ -327,9 +335,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -327,9 +335,9 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!e) if (!e)
log_warnu_return(LOG_EXIT_ZERO,"use the service -- permission denied") ; log_warnu_return(LOG_EXIT_ZERO,"use the service -- permission denied") ;
} }
}
res->user = resolve_add_string(wres, sa.s) ; res->user = resolve_add_string(wres, sa.s) ;
}
break ; break ;
...@@ -338,7 +346,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -338,7 +346,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->dependencies.depends = parse_compute_list(wres, &sa, &res->dependencies.ndepends, 0) ; if (sa.len)
res->dependencies.depends = parse_compute_list(wres, &sa, &res->dependencies.ndepends, 0) ;
break ; break ;
...@@ -347,7 +356,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -347,7 +356,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->dependencies.requiredby = parse_compute_list(wres, &sa, &res->dependencies.nrequiredby, 0) ; if (sa.len)
res->dependencies.requiredby = parse_compute_list(wres, &sa, &res->dependencies.nrequiredby, 0) ;
break ; break ;
...@@ -356,7 +366,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -356,7 +366,8 @@ int parse_store_main(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->dependencies.optsdeps = parse_compute_list(wres, &sa, &res->dependencies.noptsdeps, 1) ; if (sa.len)
res->dependencies.optsdeps = parse_compute_list(wres, &sa, &res->dependencies.noptsdeps, 1) ;
break ; break ;
......
...@@ -46,7 +46,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -46,7 +46,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->regex.directories = parse_compute_list(wres, &sa, &res->regex.ndirectories, 0) ; if (sa.len)
res->regex.directories = parse_compute_list(wres, &sa, &res->regex.ndirectories, 0) ;
break ; break ;
...@@ -55,7 +56,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -55,7 +56,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->regex.files = parse_compute_list(wres, &sa, &res->regex.nfiles, 0) ; if (sa.len)
res->regex.files = parse_compute_list(wres, &sa, &res->regex.nfiles, 0) ;
break ; break ;
...@@ -64,7 +66,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey) ...@@ -64,7 +66,8 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey)
if (!parse_clean_list(&sa, store)) if (!parse_clean_list(&sa, store))
parse_error_return(0, 8, idsec, idkey) ; parse_error_return(0, 8, idsec, idkey) ;
res->regex.infiles = parse_compute_list(wres, &sa, &res->regex.ninfiles, 0) ; if (sa.len)
res->regex.infiles = parse_compute_list(wres, &sa, &res->regex.ninfiles, 0) ;
break ; break ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment