diff --git a/configure.ac b/configure.ac index adac52e..30136ab 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,6 @@ AC_INIT([antd], [1.0.4b], [xsang.le@gmail.com]) # We’re going to use automake for this project AM_INIT_AUTOMAKE([subdir-objects]) -: ${CFLAGS="-g -O0"} # dependencies # C compiler AC_PROG_CC diff --git a/dist/antd-1.0.4b.tar.gz b/dist/antd-1.0.4b.tar.gz index 1202100..01aca88 100644 Binary files a/dist/antd-1.0.4b.tar.gz and b/dist/antd-1.0.4b.tar.gz differ diff --git a/lib/plugin.c b/lib/plugin.c deleted file mode 100644 index f257c78..0000000 --- a/lib/plugin.c +++ /dev/null @@ -1,92 +0,0 @@ -#include "plugin.h" - -plugin_header_t __plugin__; -// private function -void __init_plugin__(const char* pl,config_t* conf){ - __plugin__.name = strdup(pl); - __plugin__.dbpath= strdup(conf->db_path); - __plugin__.htdocs = strdup(conf->htdocs); - __plugin__.pdir = strdup(conf->plugins_dir); - __plugin__.sport = conf->port; -#ifdef USE_OPENSSL - __plugin__.usessl = conf->usessl; -#endif - __plugin__.raw_body = 0; - init(); -}; -void use_raw_body() -{ - __plugin__.raw_body = 1; -} -#ifdef USE_DB -sqldb __getdb(char *name) -{ - int plen = strlen(name)+strlen(__plugin__.dbpath)+4; - char* path = (char*) malloc(plen*sizeof(char)); - strcpy(path,__plugin__.dbpath); - strcat(path,name); - strcat(path,".db"); - //LOG("database: %s\n", path); - sqldb ret = (sqldb)database(path); - free(path); - return ret; -} -sqldb getdb() -{ - return __getdb(__plugin__.name); -} -#endif - -/*#ifdef USE_OPENSSL -int usessl() - { - LOG("CALLED from plugin \n"); - return __plugin__.usessl; - } - #endif*/ -plugin_header_t* meta() -{ - return &__plugin__; -} -char* route(const char* repath) -{ - int len = strlen(__plugin__.name) + 2; - if(repath != NULL) - len += strlen(repath)+1; - char * path = (char*) malloc(len*sizeof(char)); - strcpy(path,"/"); - strcat(path,__plugin__.name); - if(repath != NULL) - { - strcat(path,"/"); - strcat(path,repath); - } - return path; -} - -char* htdocs(const char* repath) -{ - if(repath != NULL) - return __s("%s/%s",__plugin__.htdocs,repath); - else - return __s("%s",__plugin__.htdocs); -} - -char* config_dir() -{ - struct stat st; - char* path = __s("%s%s%s", __plugin__.pdir,DIR_SEP, __plugin__.name); - if (stat(path, &st) == -1) - mkdir(path, 0755); - return path; -} - -void __release__() -{ - destroy(); - LOG("Releasing plugin\n"); - if(__plugin__.name) free(__plugin__.name); - if(__plugin__.dbpath) free(__plugin__.dbpath); - if(__plugin__.htdocs) free(__plugin__.htdocs); - if(__plugin__.pdir) free(__plugin__.pdir); -} \ No newline at end of file diff --git a/lib/plugin.h b/lib/plugin.h index eb5acc7..1321f05 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -34,6 +34,7 @@ void use_raw_body(); /* STATIC PART, should be included in any plugin */ +#ifdef PLUGIN_IMPLEMENT static plugin_header_t __plugin__; // private function void __init_plugin__(const char* pl,config_t* conf){ @@ -125,3 +126,4 @@ void __release__() if(__plugin__.pdir) free(__plugin__.pdir); } #endif +#endif