← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/clamav/jaunty-backports

« back to all changes in this revision

Viewing changes to clamscan/manager.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-10-02 17:11:00 UTC
  • mfrom: (0.3.1 lucid-proposed)
  • Revision ID: james.westby@ubuntu.com-20101002171100-0erjjoucua6kw2pc
Tags: 0.96.3+dfsg-2ubuntu0.10.04.1~jaunty1
* Source backport for Jaunty
  - Change build-dep on libtdl-dev to libtdl7-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
clamscan/manager.c
404
404
        cl_engine_set_num(engine, CL_ENGINE_BYTECODE_SECURITY, CL_BYTECODE_TRUST_ALL);
405
405
    if((opt = optget(opts,"bytecode-timeout"))->enabled)
406
406
        cl_engine_set_num(engine, CL_ENGINE_BYTECODE_TIMEOUT, opt->numarg);
 
407
    if((opt = optget(opts,"bytecode-mode"))->enabled) {
 
408
        enum bytecode_mode mode;
 
409
        if (!strcmp(opt->strarg, "ForceJIT"))
 
410
            mode = CL_BYTECODE_MODE_JIT;
 
411
        else if(!strcmp(opt->strarg, "ForceInterpreter"))
 
412
            mode = CL_BYTECODE_MODE_INTERPRETER;
 
413
        else if(!strcmp(opt->strarg, "Test"))
 
414
            mode = CL_BYTECODE_MODE_TEST;
 
415
        else
 
416
            mode = CL_BYTECODE_MODE_AUTO;
 
417
        cl_engine_set_num(engine, CL_ENGINE_BYTECODE_MODE, mode);
 
418
    }
407
419
 
408
420
    if((opt = optget(opts, "tempdir"))->enabled) {
409
421
        if((ret = cl_engine_set_str(engine, CL_ENGINE_TMPDIR, opt->strarg))) {
414
426
    }
415
427
 
416
428
    if((opt = optget(opts, "database"))->active) {
417
 
        if((ret = cl_load(opt->strarg, engine, &info.sigs, dboptions))) {
418
 
            logg("!%s\n", cl_strerror(ret));
419
 
            cl_engine_free(engine);
420
 
            return 2;
 
429
        while(opt) {
 
430
            if((ret = cl_load(opt->strarg, engine, &info.sigs, dboptions))) {
 
431
                logg("!%s\n", cl_strerror(ret));
 
432
                cl_engine_free(engine);
 
433
                return 2;
 
434
            }
 
435
            opt = opt->nextarg;
421
436
        }
422
 
 
423
437
    } else {
424
438
            char *dbdir = freshdbdir();
425
439