mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Version 0.3.0 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
7
loader.c
7
loader.c
@@ -28,6 +28,7 @@
|
||||
#define __USE_GNU
|
||||
#include <pthread.h>
|
||||
#include "asterisk.h"
|
||||
#include "astconf.h"
|
||||
|
||||
static char expected_key[] =
|
||||
{ 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75,
|
||||
@@ -204,7 +205,7 @@ int ast_load_resource(char *resource_name)
|
||||
if (resource_name[0] == '/') {
|
||||
strncpy(fn, resource_name, sizeof(fn)-1);
|
||||
} else {
|
||||
snprintf(fn, sizeof(fn), "%s/%s", AST_MODULE_DIR, resource_name);
|
||||
snprintf(fn, sizeof(fn), "%s/%s", (char *)ast_config_AST_MODULE_DIR, resource_name);
|
||||
}
|
||||
m->lib = dlopen(fn, flags);
|
||||
if (!m->lib) {
|
||||
@@ -331,7 +332,7 @@ int load_modules()
|
||||
int x;
|
||||
/* Make two passes. First, load any resource modules, then load the others. */
|
||||
for (x=0;x<2;x++) {
|
||||
mods = opendir(AST_MODULE_DIR);
|
||||
mods = opendir((char *)ast_config_AST_MODULE_DIR);
|
||||
if (mods) {
|
||||
while((d = readdir(mods))) {
|
||||
/* Must end in .so to load it. */
|
||||
@@ -374,7 +375,7 @@ int load_modules()
|
||||
closedir(mods);
|
||||
} else {
|
||||
if (!option_quiet)
|
||||
ast_log(LOG_WARNING, "Unable to open modules directory " AST_MODULE_DIR ".\n");
|
||||
ast_log(LOG_WARNING, "Unable to open modules directory %s.\n", (char *)ast_config_AST_MODULE_DIR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user