varnish-cache/lib/libvcc/vcc_vmod.c
0
/*-
1
 * Copyright (c) 2010-2015 Varnish Software AS
2
 * All rights reserved.
3
 *
4
 * Author: Poul-Henning Kamp <phk@phk.freebsd.dk>
5
 *
6
 * SPDX-License-Identifier: BSD-2-Clause
7
 *
8
 * Redistribution and use in source and binary forms, with or without
9
 * modification, are permitted provided that the following conditions
10
 * are met:
11
 * 1. Redistributions of source code must retain the above copyright
12
 *    notice, this list of conditions and the following disclaimer.
13
 * 2. Redistributions in binary form must reproduce the above copyright
14
 *    notice, this list of conditions and the following disclaimer in the
15
 *    documentation and/or other materials provided with the distribution.
16
 *
17
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
18
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20
 * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
21
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27
 * SUCH DAMAGE.
28
 *
29
 * Parse `import`, check metadata and versioning.
30
 *
31
 */
32
33
#include "config.h"
34
35
#include <stdlib.h>
36
#include <string.h>
37
38
#include "vcc_compile.h"
39
40
#include "libvcc.h"
41
#include "vfil.h"
42
#include "vjsn.h"
43
#include "vmod_abi.h"
44
45
#include "vcc_vmod.h"
46
47
struct vmod_import {
48
        unsigned                        magic;
49
#define VMOD_IMPORT_MAGIC               0x31803a5d
50
        const char                      *err;
51
        struct vsb                      *json;
52
        char                            *path;
53
        VTAILQ_ENTRY(vmod_import)       list;
54
        int                             from_vext;
55
        int                             unimported_vext;
56
57
        // From $VMOD
58
        double                          vmod_syntax;
59
        char                            *name;
60
        char                            *func_name;
61
        char                            *file_id;
62
        char                            *abi;
63
        unsigned                        major;
64
        unsigned                        minor;
65
66
        struct symbol                   *sym;
67
        const struct token              *t_mod;
68
        struct vjsn                     *vj;
69
#define STANZA(UU, ll, ss)              int n_##ll;
70
        STANZA_TBL
71
#undef STANZA
72
};
73
74
static VTAILQ_HEAD(,vmod_import) imports = VTAILQ_HEAD_INITIALIZER(imports);
75
76
typedef void vcc_do_stanza_f(struct vcc *tl, const struct vmod_import *vim,
77
    const struct vjsn_val *vv);
78
79
static int
80 23600
vcc_Extract_JSON(struct vmod_import *vim, const char *filename)
81
{
82 23600
        const char *magic = "VMOD_JSON_SPEC\x02", *p;
83
        int c;
84
        FILE *f;
85
86 23600
        CHECK_OBJ_NOTNULL(vim, VMOD_IMPORT_MAGIC);
87 23600
        AN(filename);
88
89 23600
        f = fopen(filename, "rb");
90 23600
        if (f == NULL) {
91 40
                vim->err = strerror(errno);
92 40
                return (-1);
93
        }
94
95 23560
        p = magic;
96 23560
        vim->err = "No VMOD JSON found";
97 1913160
        while (1) {
98 462653120
                c = getc(f);
99 462653120
                if (c == EOF) {
100 40
                        AZ(fclose(f));
101 40
                        vim->err = "No VMOD JSON found";
102 40
                        return (-1);
103
                }
104 462653080
                if (c != *p) {
105 460739960
                        p = magic;
106 460739960
                        continue;
107
                }
108 1913120
                p++;
109 1913120
                if (*p == '\0')
110 23520
                        break;
111
        }
112
113 23520
        vim->json = VSB_new_auto();
114 23520
        AN(vim->json);
115
116 482084800
        while (1) {
117 482084800
                c = getc(f);
118 482084800
                if (c == EOF) {
119 40
                        AZ(fclose(f));
120 40
                        vim->err = "Truncated VMOD JSON";
121 40
                        VSB_destroy(&vim->json);
122 40
                        return (-1);
123
                }
124 482084760
                if (c == '\x03')
125 23480
                        break;
126 482061280
                VSB_putc(vim->json, c);
127
        }
128 23480
        AZ(fclose(f));
129 23480
        AZ(VSB_finish(vim->json));
130 23480
        return (0);
131 23600
}
132
133
static const char *
134 23480
vcc_ParseJSON(const struct vcc *tl, const char *jsn, struct vmod_import *vim)
135
{
136
        const struct vjsn_val *vv, *vv2, *vv3;
137
        const char *err;
138
        char *p;
139
140 23480
        vim->vj = vjsn_parse(jsn, &err);
141 23480
        if (err != NULL)
142 40
                return (err);
143 23440
        AN(vim->vj);
144
145 23440
        vv = vim->vj->value;
146 23440
        if (!vjsn_is_array(vv))
147 40
                return ("Not array[0]");
148
149 23400
        vv2 = VTAILQ_FIRST(&vv->children);
150 23400
        AN(vv2);
151 23400
        if (!vjsn_is_array(vv2))
152 40
                return ("Not array[1]");
153 23360
        vv3 = VTAILQ_FIRST(&vv2->children);
154 23360
        AN(vv3);
155 23360
        if (!vjsn_is_string(vv3))
156 40
                return ("Not string[2]");
157 23320
        if (strcmp(vv3->value, "$VMOD"))
158 40
                return ("Not $VMOD[3]");
159
160 23280
        vv3 = VTAILQ_NEXT(vv3, list);
161 23280
        AN(vv3);
162 23280
        assert(vjsn_is_string(vv3));
163 23280
        vim->vmod_syntax = strtod(vv3->value, NULL);
164 23280
        if (vim->vmod_syntax != 2.0)
165 40
                return ("Syntax != 2.0");
166
167 23240
        vv3 = VTAILQ_NEXT(vv3, list);
168 23240
        AN(vv3);
169 23240
        assert(vjsn_is_string(vv3));
170 23240
        vim->name = vv3->value;
171
172 23240
        vv3 = VTAILQ_NEXT(vv3, list);
173 23240
        AN(vv3);
174 23240
        assert(vjsn_is_string(vv3));
175 23240
        vim->func_name = vv3->value;
176
177 23240
        vv3 = VTAILQ_NEXT(vv3, list);
178 23240
        AN(vv3);
179 23240
        assert(vjsn_is_string(vv3));
180 23240
        vim->file_id = vv3->value;
181
182 23240
        vv3 = VTAILQ_NEXT(vv3, list);
183 23240
        AN(vv3);
184 23240
        assert(vjsn_is_string(vv3));
185 23240
        vim->abi = vv3->value;
186
187 23240
        vv3 = VTAILQ_NEXT(vv3, list);
188 23240
        AN(vv3);
189 23240
        assert(vjsn_is_string(vv3));
190 23240
        vim->major = strtoul(vv3->value, &p, 10);
191 23240
        assert(p == NULL || *p == '\0' || *p == 'U');
192
193 23240
        vv3 = VTAILQ_NEXT(vv3, list);
194 23240
        AN(vv3);
195 23240
        assert(vjsn_is_string(vv3));
196 23240
        vim->minor = strtoul(vv3->value, &p, 10);
197 23240
        assert(p == NULL || *p == '\0' || *p == 'U');
198
199
200 23240
        if (vim->major == 0 && vim->minor == 0 &&
201 17880
            strcmp(vim->abi, VMOD_ABI_Version)) {
202 40
                VSB_printf(tl->sb, "Incompatible VMOD %.*s\n", PF(vim->t_mod));
203 40
                VSB_printf(tl->sb, "\tFile name: %s\n", vim->path);
204 80
                VSB_printf(tl->sb, "\tABI mismatch, expected <%s>, got <%s>\n",
205 40
                           VMOD_ABI_Version, vim->abi);
206 40
                return ("");
207
        }
208 28520
        if (vim->major != 0 &&
209 5360
            (vim->major != VRT_MAJOR_VERSION ||
210 5320
            vim->minor > VRT_MINOR_VERSION)) {
211 40
                VSB_printf(tl->sb, "Incompatible VMOD %.*s\n", PF(vim->t_mod));
212 40
                VSB_printf(tl->sb, "\tFile name: %s\n", vim->path);
213 80
                VSB_printf(tl->sb, "\tVMOD wants ABI version %u.%u\n",
214 40
                    vim->major, vim->minor);
215 40
                VSB_printf(tl->sb, "\tvarnishd provides ABI version %u.%u\n",
216
                    VRT_MAJOR_VERSION, VRT_MINOR_VERSION);
217 40
                return ("");
218
        }
219
220
221 869240
        VTAILQ_FOREACH(vv2, &vv->children, list) {
222 846120
                assert (vjsn_is_array(vv2));
223 846120
                vv3 = VTAILQ_FIRST(&vv2->children);
224 846120
                assert(vjsn_is_string(vv3));
225 846120
                assert(vv3->value[0] == '$');
226
#define STANZA(UU, ll, ss) \
227
    if (!strcmp(vv3->value, "$" #UU)) {vim->n_##ll++; continue;}
228 846120
                STANZA_TBL
229
#undef STANZA
230 40
                return ("Unknown metadata stanza.");
231
        }
232 23120
        if (vim->n_cproto != 1)
233 40
                return ("Bad cproto stanza(s)");
234 23080
        if (vim->n_vmod != 1)
235 40
                return ("Bad vmod stanza(s)");
236 23040
        return (NULL);
237 23480
}
238
239
/*
240
 * Load and check the metadata from the objectfile containing the vmod
241
 */
242
243
static int
244 23480
vcc_VmodLoad(struct vcc *tl, struct vmod_import *vim)
245
{
246
        static const char *err;
247
        struct vmod_import *vim2;
248
249 23480
        CHECK_OBJ_NOTNULL(vim, VMOD_IMPORT_MAGIC);
250
251 23480
        err = vcc_ParseJSON(tl, VSB_data(vim->json), vim);
252 23480
        if (err != NULL && *err != '\0') {
253 720
                VSB_printf(tl->sb,
254 360
                    "VMOD %.*s: bad metadata\n", PF(vim->t_mod));
255 360
                VSB_printf(tl->sb, "\t(%s)\n", err);
256 360
                VSB_printf(tl->sb, "\tFile name: %s\n", vim->path);
257 360
        }
258
259 23480
        if (err != NULL)
260 440
                return (-1);
261
262 28840
        VTAILQ_FOREACH(vim2, &imports, list) {
263 5960
                if (strcmp(vim->name, vim2->name))
264 5800
                        continue;
265 160
                if (!strcmp(vim->file_id, vim2->file_id)) {
266
                        // (Truly) duplicate imports are OK
267 120
                        return (0);
268
                }
269 80
                VSB_printf(tl->sb,
270
                    "Different version of VMOD %.*s already loaded\n",
271 40
                    PF(vim->t_mod));
272 40
                vcc_ErrWhere(tl, vim->t_mod);
273 40
                VSB_cat(tl->sb, "Previous import at:\n");
274 40
                vcc_ErrWhere(tl, vim2->t_mod);
275 40
                vcc_Warn(tl);
276 40
                break;
277
        }
278 22920
        VTAILQ_INSERT_TAIL(&imports, vim, list);
279
280 22920
        return (0);
281 23480
}
282
283
static void v_matchproto_(vcc_do_stanza_f)
284 4920
vcc_do_event(struct vcc *tl, const struct vmod_import *vim,
285
    const struct vjsn_val *vv)
286
{
287
        struct inifin *ifp;
288
289 4920
        ifp = New_IniFin(tl);
290 9840
        VSB_printf(ifp->ini,
291
            "\tif (%s(ctx, &vmod_priv_%s, VCL_EVENT_LOAD))\n"
292
            "\t\treturn(1);",
293 4920
            vv->value, vim->sym->vmod_name);
294 9840
        VSB_printf(ifp->fin,
295
            "\t\t(void)%s(ctx, &vmod_priv_%s,\n"
296
            "\t\t\t    VCL_EVENT_DISCARD);",
297 4920
            vv->value, vim->sym->vmod_name);
298 9840
        VSB_printf(ifp->event, "%s(ctx, &vmod_priv_%s, ev)",
299 4920
            vv->value, vim->sym->vmod_name);
300 4920
}
301
302
static void v_matchproto_(vcc_do_stanza_f)
303 22760
vcc_do_cproto(struct vcc *tl, const struct vmod_import *vim,
304
    const struct vjsn_val *vv)
305
{
306 22760
        (void)vim;
307 22760
        do {
308 4537080
                assert (vjsn_is_string(vv));
309 4537080
                Fh(tl, 0, "%s\n", vv->value);
310 4537080
                vv = VTAILQ_NEXT(vv, list);
311 4537080
        } while(vv != NULL);
312 22760
}
313
314
static void
315 45520
vcc_vj_foreach(struct vcc *tl, const struct vmod_import *vim,
316
    const char *stanza, vcc_do_stanza_f *func)
317
{
318
        const struct vjsn_val *vv, *vv2, *vv3;
319
320 45520
        vv = vim->vj->value;
321 45520
        assert (vjsn_is_array(vv));
322 1705760
        VTAILQ_FOREACH(vv2, &vv->children, list) {
323 1660240
                assert (vjsn_is_array(vv2));
324 1660240
                vv3 = VTAILQ_FIRST(&vv2->children);
325 1660240
                assert (vjsn_is_string(vv3));
326 1660240
                if (!strcmp(vv3->value, stanza))
327 27680
                        func(tl, vim, VTAILQ_NEXT(vv3, list));
328 1660240
        }
329 45520
}
330
331
static void
332 22760
vcc_emit_setup(struct vcc *tl, const struct vmod_import *vim)
333
{
334
        struct inifin *ifp;
335 22760
        const struct token *mod = vim->t_mod;
336
337 22760
        ifp = New_IniFin(tl);
338
339 22760
        VSB_cat(ifp->ini, "\tif (VPI_Vmod_Init(ctx,\n");
340 22760
        VSB_printf(ifp->ini, "\t    &VGC_vmod_%.*s,\n", PF(mod));
341 22760
        VSB_printf(ifp->ini, "\t    %u,\n", tl->vmod_count++);
342 22760
        VSB_printf(ifp->ini, "\t    &%s,\n", vim->func_name);
343 22760
        VSB_printf(ifp->ini, "\t    sizeof(%s),\n", vim->func_name);
344 22760
        VSB_printf(ifp->ini, "\t    \"%.*s\",\n", PF(mod));
345 22760
        VSB_cat(ifp->ini, "\t    ");
346 22760
        VSB_quote(ifp->ini, vim->path, -1, VSB_QUOTE_CSTR);
347 22760
        VSB_cat(ifp->ini, ",\n");
348 22760
        AN(vim->file_id);
349 22760
        VSB_printf(ifp->ini, "\t    \"%s\",\n", vim->file_id);
350 22760
        if (vim->from_vext) {
351 40
                VSB_cat(ifp->ini, "\t    ");
352 40
                VSB_quote(ifp->ini, vim->path, -1, VSB_QUOTE_CSTR);
353 40
                VSB_cat(ifp->ini, "\n");
354 40
        } else {
355 45440
                VSB_printf(ifp->ini, "\t    \"./vmod_cache/_vmod_%.*s.%s\"\n",
356 22720
                    PF(mod), vim->file_id);
357
        }
358 22760
        VSB_cat(ifp->ini, "\t    ))\n");
359 22760
        VSB_cat(ifp->ini, "\t\treturn(1);");
360
361 22760
        VSB_cat(tl->symtab, ",\n    {\n");
362 22760
        VSB_cat(tl->symtab, "\t\"dir\": \"import\",\n");
363 22760
        VSB_cat(tl->symtab, "\t\"type\": \"$VMOD\",\n");
364 22760
        VSB_printf(tl->symtab, "\t\"name\": \"%.*s\",\n", PF(mod));
365 22760
        if (vim->from_vext)
366 40
                VSB_cat(tl->symtab, "\t\"vext\": true,\n");
367
        else
368 22720
                VSB_cat(tl->symtab, "\t\"vext\": false,\n");
369 22760
        VSB_printf(tl->symtab, "\t\"file\": \"%s\",\n", vim->path);
370 45520
        VSB_printf(tl->symtab, "\t\"dst\": \"./vmod_cache/_vmod_%.*s.%s\"\n",
371 22760
            PF(mod), vim->file_id);
372 22760
        VSB_cat(tl->symtab, "    }");
373
374
        /* XXX: zero the function pointer structure ?*/
375 45520
        VSB_printf(ifp->fin, "\t\tVRT_priv_fini(ctx, &vmod_priv_%.*s);",
376 22760
            PF(mod));
377 45520
        VSB_printf(ifp->final, "\t\tVPI_Vmod_Unload(ctx, &VGC_vmod_%.*s);",
378 22760
            PF(mod));
379
380 22760
        vcc_vj_foreach(tl, vim, "$EVENT", vcc_do_event);
381
382 22760
        Fh(tl, 0, "\n/* --- BEGIN VMOD %.*s --- */\n\n", PF(mod));
383 22760
        Fh(tl, 0, "static struct vmod *VGC_vmod_%.*s;\n", PF(mod));
384 22760
        Fh(tl, 0, "static struct vmod_priv vmod_priv_%.*s;\n", PF(mod));
385
386 22760
        vcc_vj_foreach(tl, vim, "$CPROTO", vcc_do_cproto);
387
388 22760
        Fh(tl, 0, "\n/* --- END VMOD %.*s --- */\n\n", PF(mod));
389 22760
}
390
391
static void
392 840
vcc_vim_destroy(struct vmod_import **vimp)
393
{
394
        struct vmod_import *vim;
395
396 840
        TAKE_OBJ_NOTNULL(vim, vimp, VMOD_IMPORT_MAGIC);
397 840
        if (vim->path)
398 800
                free(vim->path);
399 840
        if (vim->vj)
400 640
                vjsn_delete(&vim->vj);
401 840
        if (vim->json)
402 680
                VSB_destroy(&vim->json);
403 840
        FREE_OBJ(vim);
404 840
}
405
406
static int
407 23560
vcc_path_open(void *priv, const char *fn)
408
{
409
        struct vmod_import *vim;
410
411 23560
        CAST_OBJ_NOTNULL(vim, priv, VMOD_IMPORT_MAGIC);
412 23560
        AN(fn);
413
414 23560
        return (vcc_Extract_JSON(vim, fn));
415
}
416
417
void
418 23760
vcc_ParseImport(struct vcc *tl)
419
{
420
        char fn[1024];
421
        const char *p;
422
        struct token *mod, *tmod, *t1;
423
        struct symbol *msym, *vsym;
424 23760
        struct vmod_import *vim = NULL;
425
        const struct vmod_import *vimold;
426
427 23760
        t1 = tl->t;
428 23760
        SkipToken(tl, ID);              /* "import" */
429
430 23760
        ExpectErr(tl, ID);              /* "vmod_name" */
431 23760
        mod = tl->t;
432 23760
        tmod = vcc_PeekTokenFrom(tl, mod);
433 23760
        AN(tmod);
434 23760
        if (tmod->tok == ID && vcc_IdIs(tmod, "as")) {
435 200
                vcc_NextToken(tl);              /* "vmod_name" */
436 200
                vcc_NextToken(tl);              /* "as" */
437 200
                ExpectErr(tl, ID);              /* "vcl_name" */
438 200
        }
439 23760
        tmod = tl->t;
440
441 23760
        msym = VCC_SymbolGet(tl, SYM_MAIN, SYM_VMOD, SYMTAB_CREATE, XREF_NONE);
442 23760
        ERRCHK(tl);
443 23720
        AN(msym);
444
445 23720
        bprintf(fn, "libvmod_%.*s.so", PF(mod));
446 23720
        if (tl->t->tok == ID) {
447 200
                if (!vcc_IdIs(tl->t, "from")) {
448 40
                        VSB_cat(tl->sb, "Expected 'from path ...'\n");
449 40
                        vcc_ErrWhere(tl, tl->t);
450 40
                        return;
451
                }
452 160
                vcc_NextToken(tl);
453 160
                if (!tl->unsafe_path && strchr(tl->t->dec, '/')) {
454 40
                        VSB_cat(tl->sb,
455
                            "'import ... from path ...' is unsafe.\nAt:");
456 40
                        vcc_ErrToken(tl, tl->t);
457 40
                        vcc_ErrWhere(tl, tl->t);
458 40
                        return;
459
                }
460 120
                ExpectErr(tl, CSTR);
461 120
                p = strrchr(tl->t->dec, '/');
462 120
                if (p != NULL && p[1] == '\0')
463 40
                        bprintf(fn, "%slibvmod_%.*s.so", tl->t->dec, PF(mod));
464
                else
465 80
                        bprintf(fn, "%s", tl->t->dec);
466 120
                vcc_NextToken(tl);
467 120
        } else {
468 29560
                VTAILQ_FOREACH(vim, &imports, list) {
469 6080
                        if (!vcc_IdIs(mod, vim->name))
470 5920
                                continue;
471 160
                        if (!vim->unimported_vext)
472 120
                                continue;
473 40
                        fprintf(stderr, "IMPORT %s from VEXT\n", vim->name);
474 40
                        vim->unimported_vext = 0;
475 40
                        vim->t_mod = mod;
476 40
                        vim->sym = msym;
477 40
                        break;
478
                }
479
        }
480
481 23640
        SkipToken(tl, ';');
482
483 23640
        if (vim == NULL) {
484 23600
                ALLOC_OBJ(vim, VMOD_IMPORT_MAGIC);
485 23600
                AN(vim);
486 23600
                vim->t_mod = mod;
487 23600
                vim->sym = msym;
488
489 23600
                if (VFIL_searchpath(tl->vmod_path, vcc_path_open, vim, fn, &vim->path)) {
490 160
                        if (vim->err == NULL) {
491 80
                                VSB_printf(tl->sb,
492 40
                                    "Could not find VMOD %.*s\n", PF(mod));
493 40
                        } else {
494 240
                                VSB_printf(tl->sb,
495 120
                                    "Could not open VMOD %.*s\n", PF(mod));
496 240
                                VSB_printf(tl->sb, "\tFile name: %s\n",
497 120
                                    vim->path != NULL ? vim->path : fn);
498 120
                                VSB_printf(tl->sb, "\tError: %s\n", vim->err);
499
                        }
500 160
                        vcc_ErrWhere(tl, mod);
501 160
                        vcc_vim_destroy(&vim);
502 160
                        return;
503
                }
504
505 23440
                if (vcc_VmodLoad(tl, vim) < 0 || tl->err) {
506 440
                        vcc_ErrWhere(tl, vim->t_mod);
507 440
                        vcc_vim_destroy(&vim);
508 440
                        return;
509
                }
510 23000
        }
511
512 23040
        if (!vcc_IdIs(vim->t_mod, vim->name)) {
513 80
                vcc_ErrWhere(tl, vim->t_mod);
514 160
                VSB_printf(tl->sb, "Wrong file for VMOD %.*s\n",
515 80
                    PF(vim->t_mod));
516 80
                VSB_printf(tl->sb, "\tFile name: %s\n", vim->path);
517 80
                VSB_printf(tl->sb, "\tContains vmod \"%s\"\n", vim->name);
518 80
                vcc_vim_destroy(&vim);
519 80
                return;
520
        }
521
522 22960
        vimold = msym->import;
523 22960
        if (vimold != NULL) {
524 120
                CHECK_OBJ(vimold, VMOD_IMPORT_MAGIC);
525 120
                if (!strcmp(vimold->file_id, vim->file_id)) {
526
                        /* Identical import is OK */
527 80
                } else {
528 80
                        VSB_printf(tl->sb,
529
                            "Another module already imported as %.*s.\n",
530 40
                            PF(tmod));
531 40
                        vcc_ErrWhere2(tl, t1, tl->t);
532
                }
533 120
                vcc_vim_destroy(&vim);
534 120
                return;
535
        }
536 22840
        msym->def_b = t1;
537 22840
        msym->def_e = tl->t;
538
539 28560
        VTAILQ_FOREACH(vsym, &tl->sym_vmods, sideways) {
540 5760
                assert(vsym->kind == SYM_VMOD);
541 5760
                vimold = vsym->import;
542 5760
                CHECK_OBJ_NOTNULL(vimold, VMOD_IMPORT_MAGIC);
543 5760
                if (!strcmp(vimold->file_id, vim->file_id)) {
544
                        /* Already loaded under different name */
545 40
                        msym->eval_priv = vsym->eval_priv;
546 40
                        msym->import = vsym->import;
547 40
                        msym->vmod_name = vsym->vmod_name;
548 40
                        vcc_VmodSymbols(tl, msym);
549 40
                        AZ(tl->err);
550
                        // XXX: insert msym in sideways ?
551 40
                        vcc_vim_destroy(&vim);
552 40
                        return;
553
                }
554 5720
        }
555
556 22800
        VTAILQ_INSERT_TAIL(&tl->sym_vmods, msym, sideways);
557
558 22800
        msym->eval_priv = vim->vj;
559 22800
        msym->import = vim;
560 22800
        msym->vmod_name = TlDup(tl, vim->name);
561 22800
        vcc_VmodSymbols(tl, msym);
562 22800
        ERRCHK(tl);
563
564 22760
        vcc_emit_setup(tl, vim);
565 23760
}
566
567
void
568 40
vcc_ImportVext(struct vcc *tl, const char *filename)
569
{
570
        struct vmod_import *vim;
571
572 40
        ALLOC_OBJ(vim, VMOD_IMPORT_MAGIC);
573 40
        AN(vim);
574
575 40
        if (vcc_Extract_JSON(vim, filename)) {
576 0
                FREE_OBJ(vim);
577 0
                return;
578
        }
579 40
        fprintf(stderr, "FOUND VMOD in VEXT %s\n", filename);
580 40
        if (vcc_VmodLoad(tl, vim) < 0 || tl->err) {
581
                // vcc_ErrWhere(tl, vim->t_mod);
582 0
                vcc_vim_destroy(&vim);
583 0
                return;
584
        }
585 40
        vim->from_vext = 1;
586 40
        vim->unimported_vext = 1;
587 40
        vim->path = strdup(filename);
588 40
        vim->path += 1;
589 40
        AN(vim->path);
590 40
        fprintf(stderr, "GOOD VMOD %s in VEXT %s\n", vim->name, filename);
591 40
}