Tue, 13 Aug 2019 22:03:19 +0200
replace source with . in configure script and fix toolchain detection
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <dlfcn.h> #include <ucx/string.h> #include "../daemon/func.h" #include "../daemon/log.h" #include "init.h" int init_test(pblock *pb, Session *sn, Request *rq) { printf("init-test\n"); return REQ_PROCEED; } int load_modules(pblock *pb, Session *sn, Request *rq) { char *shlib = pblock_findval("shlib", pb); char *funcs = pblock_findval("funcs", pb); if(shlib == NULL || funcs == NULL) { log_ereport(LOG_MISCONFIG, "load-modules: missing parameters"); if(!shlib && funcs) { log_ereport( LOG_MISCONFIG, "load-modules: missing shlib parameter"); } else if(!shlib && !funcs) { log_ereport( LOG_MISCONFIG, "load-modules: missing funcs parameter"); } else { log_ereport( LOG_MISCONFIG, "load-modules: missing shlib and funcs parameters"); } } // load lib void *lib = dlopen(shlib, RTLD_GLOBAL | RTLD_NOW); if(lib == NULL) { char *dlerr = dlerror(); fprintf(stderr, "Cannot load library %s %s\n", shlib, dlerr); log_ereport(LOG_FAILURE, "Cannot load library %s: %s", shlib, dlerr); return REQ_ABORTED; } // load function symbols int b = 0; for(int i=0;;i++) { if(funcs[i] == '-') { funcs[i] = '_'; } if(funcs[i] == ',' || funcs[i] == 0) { if(funcs[i] == 0) { b = 1; } funcs[i] = 0; // we have a function name void *sym = dlsym(lib, funcs); if(sym == NULL) { fprintf(stderr, "Cannot load symbol %s\n", funcs); dlclose(lib); return REQ_ABORTED; } struct FuncStruct fc; ZERO(&fc, sizeof(struct FuncStruct)); fc.func = (FuncPtr)sym; fc.name = sstrdup(sstr(funcs)).ptr; add_function(&fc); if(b) { break; } funcs += i + 1; i = 0; } } // if exists, execute nsapi_module_init void *sym = dlsym(lib, "nsapi_module_init"); if(sym) { /* * We remove shlib and funcs from the pblock. The module init function * gets all remaining parameters. */ pblock_remove("shlib", pb); pblock_remove("funcs", pb); FuncPtr init_func = (FuncPtr)sym; int ret = init_func(pb, NULL, NULL); if(ret != REQ_PROCEED && ret != REQ_NOACTION) { log_ereport( LOG_FAILURE, "nsapi_module_init for module %s failed", shlib); return REQ_ABORTED; } } return REQ_PROCEED; }