From 8d88bf549da565ca9a041a44272d572a91615c76 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Fri, 9 Jun 2006 20:40:10 +0000
Subject: [PATCH] there is no reason to define our own 'maximum path length'
when the POSIX headers already define one for us
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
abstract_jb.c | 1 -
apps/app_followme.c | 36 ++++++++++++++++++------------------
apps/app_voicemail.c | 6 +++---
asterisk.c | 40 ++++++++++++++++++++--------------------
cdr/cdr_csv.c | 4 ++--
cdr/cdr_custom.c | 2 +-
cdr/cdr_radius.c | 2 +-
include/asterisk.h | 40 ++++++++++++++++++++--------------------
logger.c | 4 ++--
plc.c | 1 -
10 files changed, 67 insertions(+), 69 deletions(-)
diff --git a/abstract_jb.c b/abstract_jb.c
index d68d6d47ca..d9b4dc9650 100644
--- a/abstract_jb.c
+++ b/abstract_jb.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include "asterisk/frame.h"
#include "asterisk/channel.h"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 9355bac6cb..85dda00aad 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -92,12 +92,12 @@ struct ast_call_followme {
unsigned int active; /*!< Profile is active (1), or disabled (0). */
char takecall[20]; /*!< Digit mapping to take a call */
char nextindp[20]; /*!< Digit mapping to decline a call */
- char callfromprompt[AST_CONFIG_MAX_PATH];
- char norecordingprompt[AST_CONFIG_MAX_PATH];
- char optionsprompt[AST_CONFIG_MAX_PATH];
- char plsholdprompt[AST_CONFIG_MAX_PATH];
- char statusprompt[AST_CONFIG_MAX_PATH];
- char sorryprompt[AST_CONFIG_MAX_PATH];
+ char callfromprompt[PATH_MAX];
+ char norecordingprompt[PATH_MAX];
+ char optionsprompt[PATH_MAX];
+ char plsholdprompt[PATH_MAX];
+ char statusprompt[PATH_MAX];
+ char sorryprompt[PATH_MAX];
AST_LIST_HEAD_NOLOCK(numbers, number) numbers; /*!< Head of the list of follow-me numbers */
AST_LIST_HEAD_NOLOCK(blnumbers, number) blnumbers; /*!< Head of the list of black-listed numbers */
@@ -115,12 +115,12 @@ struct fm_args {
struct ast_channel *outbound;
char takecall[20]; /*!< Digit mapping to take a call */
char nextindp[20]; /*!< Digit mapping to decline a call */
- char callfromprompt[AST_CONFIG_MAX_PATH];
- char norecordingprompt[AST_CONFIG_MAX_PATH];
- char optionsprompt[AST_CONFIG_MAX_PATH];
- char plsholdprompt[AST_CONFIG_MAX_PATH];
- char statusprompt[AST_CONFIG_MAX_PATH];
- char sorryprompt[AST_CONFIG_MAX_PATH];
+ char callfromprompt[PATH_MAX];
+ char norecordingprompt[PATH_MAX];
+ char optionsprompt[PATH_MAX];
+ char plsholdprompt[PATH_MAX];
+ char statusprompt[PATH_MAX];
+ char sorryprompt[PATH_MAX];
struct ast_flags followmeflags;
};
@@ -156,12 +156,12 @@ static int featuredigittimeout = 5000; /*!< Feature Digit Timeout */
static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class */
static char takecall[20] = "1", nextindp[20] = "2";
-static char callfromprompt[AST_CONFIG_MAX_PATH] = "followme/call-from";
-static char norecordingprompt[AST_CONFIG_MAX_PATH] = "followme/no-recording";
-static char optionsprompt[AST_CONFIG_MAX_PATH] = "followme/followme-options";
-static char plsholdprompt[AST_CONFIG_MAX_PATH] = "followme/pls-hold-while-try";
-static char statusprompt[AST_CONFIG_MAX_PATH] = "followme/followme-status";
-static char sorryprompt[AST_CONFIG_MAX_PATH] = "followme/followme-sorry";
+static char callfromprompt[PATH_MAX] = "followme/call-from";
+static char norecordingprompt[PATH_MAX] = "followme/no-recording";
+static char optionsprompt[PATH_MAX] = "followme/followme-options";
+static char plsholdprompt[PATH_MAX] = "followme/pls-hold-while-try";
+static char statusprompt[PATH_MAX] = "followme/followme-status";
+static char sorryprompt[PATH_MAX] = "followme/followme-sorry";
static AST_LIST_HEAD_STATIC(followmes, ast_call_followme);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3b6796871a..313f33893c 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -309,7 +309,7 @@ static char odbc_table[80];
#define DELETE(a,b,c) (vm_delete(c))
#endif
-static char VM_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+static char VM_SPOOL_DIR[PATH_MAX];
static char ext_pass_cmd[128];
@@ -651,8 +651,8 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword)
char inbuf[256];
char orig[256];
char currcontext[256] ="";
- char tmpin[AST_CONFIG_MAX_PATH];
- char tmpout[AST_CONFIG_MAX_PATH];
+ char tmpin[PATH_MAX];
+ char tmpout[PATH_MAX];
struct stat statbuf;
if (!change_password_realtime(vmu, newpassword))
diff --git a/asterisk.c b/asterisk.c
index 84bac6c89c..819d998e6b 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -199,26 +199,26 @@ static int ast_el_add_history(char *);
static int ast_el_read_history(char *);
static int ast_el_write_history(char *);
-char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
-char ast_config_AST_MODULE_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-char ast_config_AST_KEY_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
-char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
-char ast_config_AST_RUN_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_RUN_USER[AST_CONFIG_MAX_PATH];
-char ast_config_AST_RUN_GROUP[AST_CONFIG_MAX_PATH];
-char ast_config_AST_CTL_PERMISSIONS[AST_CONFIG_MAX_PATH];
-char ast_config_AST_CTL_OWNER[AST_CONFIG_MAX_PATH] = "\0";
-char ast_config_AST_CTL_GROUP[AST_CONFIG_MAX_PATH] = "\0";
-char ast_config_AST_CTL[AST_CONFIG_MAX_PATH] = "asterisk.ctl";
+char ast_config_AST_CONFIG_DIR[PATH_MAX];
+char ast_config_AST_CONFIG_FILE[PATH_MAX];
+char ast_config_AST_MODULE_DIR[PATH_MAX];
+char ast_config_AST_SPOOL_DIR[PATH_MAX];
+char ast_config_AST_MONITOR_DIR[PATH_MAX];
+char ast_config_AST_VAR_DIR[PATH_MAX];
+char ast_config_AST_DATA_DIR[PATH_MAX];
+char ast_config_AST_LOG_DIR[PATH_MAX];
+char ast_config_AST_AGI_DIR[PATH_MAX];
+char ast_config_AST_DB[PATH_MAX];
+char ast_config_AST_KEY_DIR[PATH_MAX];
+char ast_config_AST_PID[PATH_MAX];
+char ast_config_AST_SOCKET[PATH_MAX];
+char ast_config_AST_RUN_DIR[PATH_MAX];
+char ast_config_AST_RUN_USER[PATH_MAX];
+char ast_config_AST_RUN_GROUP[PATH_MAX];
+char ast_config_AST_CTL_PERMISSIONS[PATH_MAX];
+char ast_config_AST_CTL_OWNER[PATH_MAX] = "\0";
+char ast_config_AST_CTL_GROUP[PATH_MAX] = "\0";
+char ast_config_AST_CTL[PATH_MAX] = "asterisk.ctl";
char ast_config_AST_SYSTEM_NAME[20] = "";
extern const char *ast_build_hostname;
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index c02cdfe71f..b1612f4b2d 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -261,7 +261,7 @@ static int build_csv_record(char *buf, size_t bufsize, struct ast_cdr *cdr)
static int writefile(char *s, char *acc)
{
- char tmp[AST_CONFIG_MAX_PATH];
+ char tmp[PATH_MAX];
FILE *f;
if (strchr(acc, '/') || (acc[0] == '.')) {
ast_log(LOG_WARNING, "Account code '%s' insecure for writing file\n", acc);
@@ -282,7 +282,7 @@ static int csv_log(struct ast_cdr *cdr)
{
/* Make sure we have a big enough buf */
char buf[1024];
- char csvmaster[AST_CONFIG_MAX_PATH];
+ char csvmaster[PATH_MAX];
snprintf(csvmaster, sizeof(csvmaster),"%s/%s/%s", ast_config_AST_LOG_DIR, CSV_LOG_DIR, CSV_MASTER);
#if 0
printf("[CDR] %s ('%s' -> '%s') Dur: %ds Bill: %ds Disp: %s Flags: %s Account: [%s]\n", cdr->channel, cdr->src, cdr->dst, cdr->duration, cdr->billsec, ast_cdr_disp2str(cdr->disposition), ast_cdr_flags2str(cdr->amaflags), cdr->accountcode);
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index f540e0a6bf..5d7152b040 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -63,7 +63,7 @@ static char *name = "cdr-custom";
static FILE *mf = NULL;
-static char master[AST_CONFIG_MAX_PATH];
+static char master[PATH_MAX];
static char format[1024]="";
static int load_config(int reload)
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 450afd6e22..66e85ec1cb 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -88,7 +88,7 @@ static char *desc = "RADIUS CDR Backend";
static char *name = "radius";
static char *cdr_config = "cdr.conf";
-static char radiuscfg[AST_CONFIG_MAX_PATH] = "/etc/radiusclient-ng/radiusclient.conf";
+static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
diff --git a/include/asterisk.h b/include/asterisk.h
index 0e2029d35f..a3e5900fdc 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -22,32 +22,32 @@
#include "asterisk/compat.h"
+#include <limits.h>
+
#define DEFAULT_LANGUAGE "en"
#define DEFAULT_SAMPLE_RATE 8000
#define DEFAULT_SAMPLES_PER_MS ((DEFAULT_SAMPLE_RATE)/1000)
-#define AST_CONFIG_MAX_PATH 255
-
/* provided in asterisk.c */
-extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_MODULE_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_KEY_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_PID[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_SOCKET[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_RUN_DIR[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_CTL_PERMISSIONS[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_CTL_OWNER[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_CTL_GROUP[AST_CONFIG_MAX_PATH];
-extern char ast_config_AST_CTL[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
+extern char ast_config_AST_CONFIG_FILE[PATH_MAX];
+extern char ast_config_AST_MODULE_DIR[PATH_MAX];
+extern char ast_config_AST_SPOOL_DIR[PATH_MAX];
+extern char ast_config_AST_MONITOR_DIR[PATH_MAX];
+extern char ast_config_AST_VAR_DIR[PATH_MAX];
+extern char ast_config_AST_DATA_DIR[PATH_MAX];
+extern char ast_config_AST_LOG_DIR[PATH_MAX];
+extern char ast_config_AST_AGI_DIR[PATH_MAX];
+extern char ast_config_AST_DB[PATH_MAX];
+extern char ast_config_AST_KEY_DIR[PATH_MAX];
+extern char ast_config_AST_PID[PATH_MAX];
+extern char ast_config_AST_SOCKET[PATH_MAX];
+extern char ast_config_AST_RUN_DIR[PATH_MAX];
+extern char ast_config_AST_CTL_PERMISSIONS[PATH_MAX];
+extern char ast_config_AST_CTL_OWNER[PATH_MAX];
+extern char ast_config_AST_CTL_GROUP[PATH_MAX];
+extern char ast_config_AST_CTL[PATH_MAX];
extern char ast_config_AST_SYSTEM_NAME[20];
int ast_set_priority(int); /*!< Provided by asterisk.c */
diff --git a/logger.c b/logger.c
index 309e13a50d..567019dbe4 100644
--- a/logger.c
+++ b/logger.c
@@ -378,8 +378,8 @@ void ast_queue_log(const char *queuename, const char *callid, const char *agent,
int reload_logger(int rotate)
{
- char old[AST_CONFIG_MAX_PATH] = "";
- char new[AST_CONFIG_MAX_PATH];
+ char old[PATH_MAX] = "";
+ char new[PATH_MAX];
int event_rotate = rotate, queue_rotate = rotate;
struct logchannel *f;
FILE *myf;
diff --git a/plc.c b/plc.c
index 5761e3bb97..4c388907e5 100644
--- a/plc.c
+++ b/plc.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <limits.h>
#include "asterisk/plc.h"
--
GitLab