MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 15:45:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stop loading plugins, we don't need plugins anymore

Browse Source
This commit is contained in:
Julien BLACHE 2009-05-03 10:52:12 +02:00
parent 2fb7537346
commit 81cb0efa81
1 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/main.c
View File

@ -90,7 +90,6 @@
#include "filescanner.h" #include "filescanner.h"
#include "httpd.h" #include "httpd.h"
#include "db-generic.h" #include "db-generic.h"
#include "plugin.h"
#include "util.h" #include "util.h"
#include "io.h" #include "io.h"
@ -152,49 +151,6 @@ void usage(char *program) {
printf("\n\n"); printf("\n\n");
} }
/**
* process a directory for plugins
*
* @returns TRUE if at least one plugin loaded successfully
*/
int load_plugin_dir(char *plugindir) {
DIR *d_plugin;
char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* ?? solaris */
struct dirent *pde;
char *pext;
char *perr=NULL;
int loaded=FALSE;
char plugin[PATH_MAX];
if((d_plugin=opendir(plugindir)) == NULL) {
DPRINTF(E_LOG,L_MAIN,"Error opening plugin dir %s. Ignoring\n",
plugindir);
return FALSE;
} else {
while((readdir_r(d_plugin,(struct dirent *)de,&pde) != 1) && pde) {
pext = strrchr(pde->d_name,'.');
if((pext) && ((strcasecmp(pext,".so") == 0) ||
(strcasecmp(pext,".dylib") == 0) ||
(strcasecmp(pext,".dll") == 0))) {
/* must be a plugin */
snprintf(plugin,PATH_MAX,"%s%c%s",plugindir,
PATHSEP,pde->d_name);
if(plugin_load(&perr,plugin) != PLUGIN_E_SUCCESS) {
DPRINTF(E_LOG,L_MAIN,"Error loading plugin %s: %s\n",
plugin,perr);
free(perr);
perr = NULL;
} else {
loaded = TRUE;
}
}
}
closedir(d_plugin);
}
return loaded;
}
static int static int
daemonize(int foreground, char *runas, char *pidfile) daemonize(int foreground, char *runas, char *pidfile)
@ -409,8 +365,6 @@ int main(int argc, char *argv[]) {
char *ffid = NULL; char *ffid = NULL;
char *perr=NULL; char *perr=NULL;
char *txtrecord[10]; char *txtrecord[10];
void *phandle;
char *plugindir;
char *pidfile = PIDFILE; char *pidfile = PIDFILE;
sigset_t sigs; sigset_t sigs;
int sigfd; int sigfd;
@ -512,25 +466,6 @@ int main(int argc, char *argv[]) {
/* initialize ffmpeg */ /* initialize ffmpeg */
av_register_all(); av_register_all();
/* load plugins before we drop privs? Maybe... let the
* plugins do stuff they might need to */
plugin_init();
plugindir = conf_alloc_string("plugins", "plugin_dir", NULL);
if (plugindir)
{
/* instead of specifying plugins, let's walk through the directory
* and load each of them */
if (!load_plugin_dir(plugindir))
DPRINTF(E_LOG, L_MAIN, "Warning: Could not load plugins\n");
free(plugindir);
}
phandle = NULL;
while ((phandle = plugin_enum(phandle)))
DPRINTF(E_LOG, L_MAIN, "Plugin loaded: %s\n", plugin_get_description(phandle));
/* Block signals for all threads except the main one */ /* Block signals for all threads except the main one */
sigemptyset(&sigs); sigemptyset(&sigs);
sigaddset(&sigs, SIGINT); sigaddset(&sigs, SIGINT);