don't use ast_copy_string when building for an external tool

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33423 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 4bac6f0a801860eaa16d7d2be2949e2192975765..e66ce128790c96e4ccb39e667bbd76cf874aa79f 100644 (file)
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -404,7 +404,11 @@ includes   { STORE_POS; return KW_INCLUDES;}
                        if (*(p1+1) != '/')
                                snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
                        else
+#ifdef STANDALONE
+                               strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
+#else
                                ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));
+#endif
                        in1 = fopen( fnamebuf, "r" );
                        if ( ! in1 ) {
                                ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Couldn't find the include file: %s; ignoring the Include directive!\n", my_file, my_lineno, my_col, fnamebuf);

diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c
index 616b675d5620ef3f826f75631ee7aed7d067031c..95635b932b63a885bab0e67cff41e19ba421af7a 100644 (file)
--- a/pbx/ael/ael_lex.c
+++ b/pbx/ael/ael_lex.c
@@ -1553,7 +1553,11 @@ YY_RULE_SETUP
                        if (*(p1+1) != '/')
                                snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
                        else
+#ifdef STANDALONE
+                               strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
+#else
                                ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));
+#endif
                        in1 = fopen( fnamebuf, "r" );
                        if ( ! in1 ) {
                                ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Couldn't find the include file: %s; ignoring the Include directive!\n", my_file, my_lineno, my_col, fnamebuf);
@@ -1586,7 +1590,7 @@ case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(paren):
 case YY_STATE_EOF(semic):
 case YY_STATE_EOF(argg):
-#line 436 "ael.flex"
+#line 440 "ael.flex"
 {
                if ( --include_stack_index < 0 ) {
                        yyterminate();
@@ -1602,10 +1606,10 @@ case YY_STATE_EOF(argg):
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 449 "ael.flex"
+#line 453 "ael.flex"
 ECHO;
        YY_BREAK
-#line 1608 "ael_lex.c"
+#line 1612 "ael_lex.c"
 
        case YY_END_OF_BUFFER:
                {
@@ -1836,7 +1840,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
                /* Read in more data. */
                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                       yyg->yy_n_chars, num_to_read );
+                       yyg->yy_n_chars, (size_t) num_to_read );
 
                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
                }
@@ -2735,7 +2739,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 449 "ael.flex"
+#line 453 "ael.flex"
 
 
 

diff --git a/utils/Makefile b/utils/Makefile
index dc31d2708d4727aebf4057081cbc9cb08799b5e4..49e466caa3a5a4d0f7f868842dc9c10f06e0e935 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -74,7 +74,7 @@ check_expr: check_expr.c ast_expr2.o ast_expr2f.o
        $(CC) $(CFLAGS) -o $@ $^
 
 aelflex.o: ../pbx/ael/ael_lex.c ../include/asterisk/ael_structs.h ../pbx/ael/ael.tab.h
-       $(CC) $(CFLAGS) -I../pbx/ -c -o $@ $<
+       $(CC) $(CFLAGS) -I../pbx/ -DSTANDALONE -c -o $@ $<
 
 aelbison.o: ../pbx/ael/ael.tab.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h
        $(CC) $(CFLAGS) -I../pbx/ -c -o $@ $<