Make it possible to pass a filedescriptor to VCC_CompileFile() if the file

is already open.  The filedescriptor will be closed.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1571 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index b8deb0241703a379e14ceb4caf5c77d295fe60bd..ad10083a9d8063c76027f6bde83b41b4aabad934 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -258,7 +258,7 @@ mgt_VccCompileFile(struct vsb *sb, const char *fn, int C_flag)
 {
        char *csrc, *vf = NULL;
 
-       csrc = VCC_CompileFile(sb, fn);
+       csrc = VCC_CompileFile(sb, fn, -1);
        if (csrc != NULL) {
                if (C_flag)
                        fputs(csrc, stdout);

diff --git a/varnish-cache/include/libvcl.h b/varnish-cache/include/libvcl.h
index 0ba8951dff57b84d577464f115605cacb87cfcbc..070f2ec250b209972b0a6e21275aecf59d13d443 100644 (file)
--- a/varnish-cache/include/libvcl.h
+++ b/varnish-cache/include/libvcl.h
@@ -30,7 +30,7 @@
  */
 
 char *VCC_Compile(struct vsb *sb, const char *b, const char *e);
-char *VCC_CompileFile(struct vsb *sb, const char *fn);
+char *VCC_CompileFile(struct vsb *sb, const char *fn, int fd);
 void VCC_InitCompile(const char *default_vcl);
 
 

diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c
index 14fe8e81efc5f9f532f194126b10b831de01e18a..e2daa6139342e524ef516da9fb803bd781d47290 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_compile.c
+++ b/varnish-cache/lib/libvcl/vcc_compile.c
@@ -377,17 +377,19 @@ vcc_destroy_source(struct source *sp)
 /*--------------------------------------------------------------------*/
 
 static struct source *
-vcc_file_source(struct vsb *sb, const char *fn)
+vcc_file_source(struct vsb *sb, const char *fn, int fd)
 {
        char *f;
-       int fd, i;
+       int i;
        struct stat st;
 
-       fd = open(fn, O_RDONLY);
        if (fd < 0) {
-               vsb_printf(sb, "Cannot open file '%s': %s\n",
-                   fn, strerror(errno));
-               return (NULL);
+               fd = open(fn, O_RDONLY);
+               if (fd < 0) {
+                       vsb_printf(sb, "Cannot open file '%s': %s\n",
+                           fn, strerror(errno));
+                       return (NULL);
+               }
        }
        assert(0 == fstat(fd, &st));
        f = malloc(st.st_size + 1);
@@ -429,7 +431,7 @@ vcc_resolve_includes(struct tokenlist *tl)
                }
                assert(t2 != NULL);
 
-               sp = vcc_file_source(tl->sb, t1->dec);
+               sp = vcc_file_source(tl->sb, t1->dec, -1);
                if (sp == NULL) {
                        vcc_ErrWhere(tl, t1);
                        return;
@@ -653,12 +655,12 @@ VCC_Compile(struct vsb *sb, const char *b, const char *e)
  */
 
 char *
-VCC_CompileFile(struct vsb *sb, const char *fn)
+VCC_CompileFile(struct vsb *sb, const char *fn, int fd)
 {
        struct source *sp;
        char *r;
 
-       sp = vcc_file_source(sb, fn);
+       sp = vcc_file_source(sb, fn, fd);
        if (sp == NULL)
                return (NULL);
        r = vcc_CompileSource(sb, sp);