Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
6
66
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
66
Commits
b94cef14
Commit
b94cef14
authored
4 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
module frontend service file location fix the module directory destination
parent
06256bdc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/include/66/parser.h
+1
-1
1 addition, 1 deletion
src/include/66/parser.h
src/include/66/resolve.h
+1
-1
1 addition, 1 deletion
src/include/66/resolve.h
src/lib66/parser_enabled.c
+1
-2
1 addition, 2 deletions
src/lib66/parser_enabled.c
src/lib66/parser_module.c
+3
-3
3 additions, 3 deletions
src/lib66/parser_module.c
with
6 additions
and
7 deletions
src/include/66/parser.h
+
1
−
1
View file @
b94cef14
...
...
@@ -335,7 +335,7 @@ extern int write_dependencies(unsigned int nga,unsigned int idga,char const *dst
extern
int
write_env
(
char
const
*
name
,
stralloc
*
sa
,
char
const
*
dst
)
;
extern
int
write_oneshot_logger
(
stralloc
*
destlog
,
sv_alltype
*
sv
)
;
/** module */
extern
int
parse_module
(
sv_alltype
*
sv_before
,
ssexec_t
*
info
,
stralloc
*
parsed_list
,
stralloc
*
tree_list
,
char
const
*
svname
,
unsigned
int
*
nbsv
,
stralloc
*
sasv
,
uint8_t
force
,
uint8_t
conf
)
;
extern
int
parse_module
(
sv_alltype
*
sv_before
,
ssexec_t
*
info
,
stralloc
*
parsed_list
,
stralloc
*
tree_list
,
char
const
*
svname
,
char
const
*
src_frontend
,
unsigned
int
*
nbsv
,
stralloc
*
sasv
,
uint8_t
force
,
uint8_t
conf
)
;
extern
int
regex_get_file_name
(
char
*
filename
,
char
const
*
str
)
;
extern
int
regex_get_replace
(
char
*
replace
,
char
const
*
str
)
;
extern
int
regex_get_regex
(
char
*
regex
,
char
const
*
str
)
;
...
...
This diff is collapsed.
Click to expand it.
src/include/66/resolve.h
+
1
−
1
View file @
b94cef14
...
...
@@ -111,7 +111,7 @@ extern void ss_resolve_free(ss_resolve_t *res) ;
extern
int
ss_resolve_pointo
(
stralloc
*
sa
,
ssexec_t
*
info
,
int
type
,
unsigned
int
where
)
;
extern
int
ss_resolve_src_path
(
stralloc
*
sasrc
,
char
const
*
sv
,
uid_t
owner
,
char
const
*
directory_forced
)
;
extern
int
ss_resolve_module_path
(
stralloc
*
sdir
,
stralloc
*
mdir
,
char
const
*
sv
,
uid_t
owner
)
;
extern
int
ss_resolve_module_path
(
stralloc
*
sdir
,
stralloc
*
mdir
,
char
const
*
sv
,
char
const
*
src_frontend
,
uid_t
owner
)
;
extern
int
ss_resolve_src
(
stralloc
*
sasrc
,
char
const
*
name
,
char
const
*
src
,
int
*
found
)
;
extern
int
ss_resolve_service_isdir
(
char
const
*
dir
,
char
const
*
name
)
;
extern
int
ss_resolve_add_uint32
(
stralloc
*
sa
,
uint32_t
data
)
;
...
...
This diff is collapsed.
Click to expand it.
src/lib66/parser_enabled.c
+
1
−
2
View file @
b94cef14
...
...
@@ -138,12 +138,11 @@ int parse_service_before(ssexec_t *info,stralloc *parsed_list,stralloc *tree_lis
if
(
sv_before
.
cname
.
itype
==
TYPE_MODULE
)
{
r
=
parse_module
(
&
sv_before
,
info
,
parsed_list
,
tree_list
,
svname
,
nbsv
,
sasv
,
force
,
conf
)
;
r
=
parse_module
(
&
sv_before
,
info
,
parsed_list
,
tree_list
,
svname
,
svsrc
,
nbsv
,
sasv
,
force
,
conf
)
;
if
(
!
r
)
return
0
;
else
if
(
r
==
2
)
{
sasv
->
len
=
0
;
sv_alltype_free
(
&
sv_before
)
;
goto
add
;
}
...
...
This diff is collapsed.
Click to expand it.
src/lib66/parser_module.c
+
3
−
3
View file @
b94cef14
...
...
@@ -125,7 +125,7 @@ static int rebuild_list(sv_alltype *sv_before,stralloc *list,stralloc *sv_all_ty
* return 2 on already enabled
* @svname do not contents the path of the frontend file*/
int
parse_module
(
sv_alltype
*
sv_before
,
ssexec_t
*
info
,
stralloc
*
parsed_list
,
stralloc
*
tree_list
,
char
const
*
svname
,
unsigned
int
*
nbsv
,
stralloc
*
sasv
,
uint8_t
force
,
uint8_t
conf
)
int
parse_module
(
sv_alltype
*
sv_before
,
ssexec_t
*
info
,
stralloc
*
parsed_list
,
stralloc
*
tree_list
,
char
const
*
svname
,
char
const
*
src_frontend
,
unsigned
int
*
nbsv
,
stralloc
*
sasv
,
uint8_t
force
,
uint8_t
conf
)
{
log_trace
(
"start parse process of module: "
,
svname
)
;
int
r
,
err
=
1
,
insta
=
-
1
,
svtype
=
-
1
,
from_ext_insta
=
0
,
already_parsed
=
0
;
...
...
@@ -142,8 +142,8 @@ int parse_module(sv_alltype *sv_before,ssexec_t *info,stralloc *parsed_list,stra
if
(
insta
<=
0
)
log_warn_return
(
LOG_EXIT_ZERO
,
"invalid module instance name: "
,
svname
);
if
(
!
ss_resolve_module_path
(
&
sdir
,
&
tmp
,
svname
,
info
->
owner
))
return
0
;
if
(
!
ss_resolve_module_path
(
&
sdir
,
&
tmp
,
svname
,
src_frontend
,
info
->
owner
))
return
0
;
/** check mandatory directories:
* module/module_name, module/module_name/{configure,service,service@} */
if
(
!
check_dir
(
tmp
.
s
,
""
))
return
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment