mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 11:58:40 +00:00
so that paths and filename are writable by asterisk.c without causing segfaults. This involves defining the variables as const char *, and having them point to as static, writable buffer defined in asterisk.c On passing, fix some errors in using these variables in some files in utils/ , and in res/snmp/agent.c which was redefining a variable without using paths.h (not applicable to 1.4) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -29,19 +29,13 @@
|
||||
#include "asterisk.h"
|
||||
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include "asterisk/paths.h" /* CONFIG_DIR */
|
||||
#include <locale.h>
|
||||
#include <ctype.h>
|
||||
#if !defined(SOLARIS) && !defined(__CYGWIN__)
|
||||
#include <err.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#include <regex.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "asterisk.h"
|
||||
#include "asterisk/pbx.h"
|
||||
@@ -59,11 +53,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#include "asterisk/pval.h"
|
||||
#include "asterisk/extconf.h"
|
||||
|
||||
const char *ast_config_AST_CONFIG_DIR = "/etc/asterisk"; /* placeholder */
|
||||
|
||||
void get_start_stop(unsigned int *word, int bitsperword, int totalbits, int *start, int *end);
|
||||
int all_bits_set(unsigned int *word, int bitsperword, int totalbits);
|
||||
extern char *days[];
|
||||
extern char *months[];
|
||||
const char ast_config_AST_CONFIG_DIR[PATH_MAX];
|
||||
|
||||
char *config = "extensions.conf";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user