From 834f783edfb8c5559cc226a4213b9bad02bb5bf8 Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Mon, 26 Mar 2007 17:56:26 +0000
Subject: [PATCH] Merged revisions 59206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59206 | murf | 2007-03-26 11:38:29 -0600 (Mon, 26 Mar 2007) | 1 line
A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/ast_expr2.fl | 2 +-
main/ast_expr2f.c | 2 +-
pbx/ael/ael.flex | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index 8f156e81fc..5990a66ed6 100644
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -241,7 +241,7 @@ int ast_expr(char *expr, char *buf, int length)
res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
return_value = (res_length <= length) ? res_length : length;
} else {
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
strncpy(buf, io.val->u.s, length - 1);
#else /* !STANDALONE && !LOW_MEMORY */
ast_copy_string(buf, io.val->u.s, length);
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index b0e69450f4..6ba3244dd1 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -3122,7 +3122,7 @@ int ast_expr(char *expr, char *buf, int length)
res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
return_value = (res_length <= length) ? res_length : length;
} else {
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
strncpy(buf, io.val->u.s, length - 1);
#else /* !STANDALONE && !LOW_MEMORY */
ast_copy_string(buf, io.val->u.s, length);
diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 41f24601c1..cfdd5eb948 100644
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -411,7 +411,7 @@ includes { STORE_POS; return KW_INCLUDES;}
if (*(p1+1) != '/')
snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
else
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
#else
ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));
--
GitLab