[master] 8686a49 Remove temporary directory iff called with -C
Federico G. Schwindt
fgsch at lodoss.net
Mon Mar 14 13:22:03 CET 2016
commit 8686a49f6331b3dc6c7467d569edf7e7aa90f9ba
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Sun Mar 13 12:37:49 2016 +0000
Remove temporary directory iff called with -C
Fixes #1869
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 3810c74..996985e 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -296,11 +296,12 @@ mgt_VccCompile(struct cli *cli, const char *vclname, const char *vclsrc,
(void)unlink(vp.csrcfile);
free(vp.csrcfile);
- free(vp.dir);
-
if (status || C_flag) {
(void)unlink(vp.libfile);
free(vp.libfile);
+ if (C_flag)
+ AZ(rmdir(vp.dir));
+ free(vp.dir);
if (status) {
VCLI_Out(cli, "VCL compilation failed");
VCLI_SetResult(cli, CLIS_PARAM);
@@ -308,6 +309,8 @@ mgt_VccCompile(struct cli *cli, const char *vclname, const char *vclsrc,
return(NULL);
}
+ free(vp.dir);
+
VCLI_Out(cli, "VCL compiled.\n");
return (vp.libfile);
More information about the varnish-commit
mailing list