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
ebacb003
Commit
ebacb003
authored
2 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
fix command name, typo fix
parent
d6ef2fbe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lib66/exec/ssexec_tree_signal.c
+9
-9
9 additions, 9 deletions
src/lib66/exec/ssexec_tree_signal.c
with
9 additions
and
9 deletions
src/lib66/exec/ssexec_tree_signal.c
+
9
−
9
View file @
ebacb003
...
@@ -409,7 +409,7 @@ static int handle_signal(pidtree_t *apidt, unsigned int what, graph_t *graph, ss
...
@@ -409,7 +409,7 @@ static int handle_signal(pidtree_t *apidt, unsigned int what, graph_t *graph, ss
case
SIGINT
:
case
SIGINT
:
log_1_warn
(
"received SIGINT, aborting transaction"
)
;
log_1_warn
(
"received SIGINT, aborting transaction"
)
;
kill_all
(
apidt
)
;
kill_all
(
apidt
)
;
ok
=
11
1
;
ok
=
11
0
;
break
;
break
;
default
:
log_die
(
LOG_EXIT_SYS
,
"unexpected data in selfpipe"
)
;
default
:
log_die
(
LOG_EXIT_SYS
,
"unexpected data in selfpipe"
)
;
}
}
...
@@ -436,6 +436,8 @@ static uint32_t compute_timeout (uint32_t timeout, tain *deadline)
...
@@ -436,6 +436,8 @@ static uint32_t compute_timeout (uint32_t timeout, tain *deadline)
static
int
ssexec_callback
(
stralloc
*
sa
,
ssexec_t
*
info
,
unsigned
int
what
)
static
int
ssexec_callback
(
stralloc
*
sa
,
ssexec_t
*
info
,
unsigned
int
what
)
{
{
log_flow
()
;
int
r
,
e
=
1
;
int
r
,
e
=
1
;
size_t
pos
=
0
,
len
=
sa
->
len
;
size_t
pos
=
0
,
len
=
sa
->
len
;
char
t
[
len
+
1
]
;
char
t
[
len
+
1
]
;
...
@@ -473,7 +475,7 @@ static int ssexec_callback(stralloc *sa, ssexec_t *info, unsigned int what)
...
@@ -473,7 +475,7 @@ static int ssexec_callback(stralloc *sa, ssexec_t *info, unsigned int what)
char
const
*
newargv
[
nargc
]
;
char
const
*
newargv
[
nargc
]
;
unsigned
int
m
=
0
;
unsigned
int
m
=
0
;
newargv
[
m
++
]
=
"
treect
l"
;
newargv
[
m
++
]
=
"
signa
l"
;
if
(
what
==
2
)
if
(
what
==
2
)
newargv
[
m
++
]
=
"-u"
;
newargv
[
m
++
]
=
"-u"
;
...
@@ -514,14 +516,12 @@ static int doit(char const *treename, ssexec_t *sinfo, unsigned int what, tain *
...
@@ -514,14 +516,12 @@ static int doit(char const *treename, ssexec_t *sinfo, unsigned int what, tain *
if
(
!
auto_stra
(
&
info
.
treename
,
treename
))
if
(
!
auto_stra
(
&
info
.
treename
,
treename
))
log_die_nomem
(
"stralloc"
)
;
log_die_nomem
(
"stralloc"
)
;
info
.
tree
.
len
=
0
;
r
=
tree_sethome
(
&
info
)
;
r
=
tree_sethome
(
&
info
)
;
if
(
r
<=
0
)
if
(
r
<=
0
)
log_warnu_return
(
LOG_EXIT_ZERO
,
"find tree: "
,
info
.
treename
.
s
)
;
log_warnu_return
(
LOG_EXIT_ZERO
,
"find tree: "
,
info
.
treename
.
s
)
;
if
(
!
tree_get_permissions
(
info
.
tre
e
.
s
,
info
.
owner
))
if
(
!
tree_get_permissions
(
info
.
bas
e
.
s
,
info
.
treename
.
s
))
log_warn_return
(
LOG_EXIT_ZERO
,
"You're not allowed to use the tree: "
,
info
.
tree
.
s
)
;
log_warn_return
(
LOG_EXIT_ZERO
,
"You're not allowed to use the tree: "
,
info
.
tree
name
.
s
)
;
}
}
if
(
!
tree_isinitialized
(
info
.
base
.
s
,
info
.
treename
.
s
)
&&
!
what
)
{
if
(
!
tree_isinitialized
(
info
.
base
.
s
,
info
.
treename
.
s
)
&&
!
what
)
{
...
@@ -533,7 +533,7 @@ static int doit(char const *treename, ssexec_t *sinfo, unsigned int what, tain *
...
@@ -533,7 +533,7 @@ static int doit(char const *treename, ssexec_t *sinfo, unsigned int what, tain *
char
const
*
newargv
[
nargc
]
;
char
const
*
newargv
[
nargc
]
;
unsigned
int
m
=
0
;
unsigned
int
m
=
0
;
newargv
[
m
++
]
=
"
tree
"
;
newargv
[
m
++
]
=
"
signal
"
;
newargv
[
m
++
]
=
info
.
treename
.
s
;
newargv
[
m
++
]
=
info
.
treename
.
s
;
newargv
[
m
++
]
=
0
;
newargv
[
m
++
]
=
0
;
...
@@ -952,12 +952,12 @@ int ssexec_tree_signal(int argc, char const *const *argv, ssexec_t *info)
...
@@ -952,12 +952,12 @@ int ssexec_tree_signal(int argc, char const *const *argv, ssexec_t *info)
}
else
if
(
what
==
1
&&
!
init
)
{
}
else
if
(
what
==
1
&&
!
init
)
{
log_warn
(
"tree: "
,
treename
,
" is already
up
"
)
;
log_warn
(
"tree: "
,
treename
,
" is already
down
"
)
;
continue
;
continue
;
}
else
if
(
what
==
2
&&
!
supervised
)
{
}
else
if
(
what
==
2
&&
!
supervised
)
{
log_warn
(
"tree: "
,
treename
,
" is already u
p
"
)
;
log_warn
(
"tree: "
,
treename
,
" is already u
nsupervised
"
)
;
continue
;
continue
;
}
}
...
...
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