Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
c5676a86
Commit
c5676a86
authored
Nov 30, 2021
by
Lachlan Abbott
Committed by
Poul-Henning Kamp
Dec 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vcl.show no param defaults to active vcl
parent
b93a741f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
17 deletions
+23
-17
cache_vcl.c
bin/varnishd/cache/cache_vcl.c
+19
-14
c00015.vtc
bin/varnishtest/tests/c00015.vtc
+2
-1
cli_cmds.h
include/tbl/cli_cmds.h
+2
-2
No files found.
bin/varnishd/cache/cache_vcl.c
View file @
c5676a86
...
...
@@ -946,28 +946,33 @@ vcl_cli_show(struct cli *cli, const char * const *av, void *priv)
{
struct
vcl
*
vcl
;
int
verbose
=
0
;
int
i
;
int
i
=
2
;
ASSERT_CLI
();
ASSERT_VCL_ACTIVE
();
AZ
(
priv
);
if
(
!
strcmp
(
av
[
2
],
"-v"
)
&&
av
[
3
]
==
NULL
)
{
VCLI_Out
(
cli
,
"Too few parameters"
);
VCLI_SetResult
(
cli
,
CLIS_TOOFEW
);
return
;
}
else
if
(
strcmp
(
av
[
2
],
"-v"
)
&&
av
[
3
]
!=
NULL
)
{
VCLI_Out
(
cli
,
"Unknown options '%s'"
,
av
[
2
]);
if
(
av
[
i
]
!=
NULL
&&
!
strcmp
(
av
[
i
],
"-v"
))
{
verbose
=
1
;
i
++
;
}
if
(
av
[
i
]
==
NULL
)
{
vcl
=
vcl_active
;
AN
(
vcl
);
}
else
{
vcl
=
vcl_find
(
av
[
i
]);
i
++
;
}
if
(
av
[
i
]
!=
NULL
)
{
VCLI_Out
(
cli
,
"Too many parameters: '%s'"
,
av
[
i
]);
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
return
;
}
else
if
(
av
[
3
]
!=
NULL
)
{
verbose
=
1
;
vcl
=
vcl_find
(
av
[
3
]);
}
else
vcl
=
vcl_find
(
av
[
2
]);
}
if
(
vcl
==
NULL
)
{
VCLI_Out
(
cli
,
"No VCL named '%s'"
,
av
[
3
]
==
NULL
?
av
[
2
]
:
av
[
3
]);
VCLI_Out
(
cli
,
"No VCL named '%s'"
,
av
[
i
-
1
]);
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
return
;
}
...
...
bin/varnishtest/tests/c00015.vtc
View file @
c5676a86
...
...
@@ -53,7 +53,8 @@ varnish v1 -cli "vcl.show vcl2"
varnish v1 -cli "vcl.show -v vcl2"
varnish v1 -cli "vcl.discard vcl2"
varnish v1 -cli "vcl.list"
varnish v1 -clierr 104 "vcl.show -v"
varnish v1 -cli "vcl.show"
varnish v1 -cli "vcl.show -v"
varnish v1 -clierr 106 "vcl.show -x nowhere"
varnish v1 -clierr 106 "vcl.show nothere"
varnish v1 -clierr 106 "vcl.use nothere"
...
...
include/tbl/cli_cmds.h
View file @
c5676a86
...
...
@@ -146,10 +146,10 @@ CLI_CMD(VCL_DEPS,
CLI_CMD
(
VCL_SHOW
,
"vcl.show"
,
"vcl.show [-v]
<configname>
"
,
"vcl.show [-v]
[<configname>]
"
,
"Display the source code for the specified configuration."
,
""
,
1
,
2
0
,
2
)
CLI_CMD
(
VCL_USE
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment