[svn-commits] branch murf/AEL-trunk-fixesonly r33444 - in
/team/murf/AEL-trunk-fixesonly: ....
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Jun 10 09:58:37 MST 2006
Author: murf
Date: Sat Jun 10 11:58:36 2006
New Revision: 33444
URL: http://svn.digium.com/view/asterisk?rev=33444&view=rev
Log:
Merged revisions 33421-33423 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r33421 | russell | 2006-06-09 22:34:48 -0600 (Fri, 09 Jun 2006) | 2 lines
convert a few more uses of AST_CONFIG_MAX_PATH to use PATH_MAX
........
r33422 | russell | 2006-06-09 22:38:04 -0600 (Fri, 09 Jun 2006) | 2 lines
don't redefine PATH_MAX
........
r33423 | russell | 2006-06-09 22:41:34 -0600 (Fri, 09 Jun 2006) | 2 lines
don't use ast_copy_string when building for an external tool
........
Modified:
team/murf/AEL-trunk-fixesonly/ (props changed)
team/murf/AEL-trunk-fixesonly/pbx/ael/ael.flex
team/murf/AEL-trunk-fixesonly/pbx/ael/ael_lex.c
team/murf/AEL-trunk-fixesonly/pbx/pbx_gtkconsole.c
team/murf/AEL-trunk-fixesonly/utils/Makefile
team/murf/AEL-trunk-fixesonly/utils/ael_main.c
Propchange: team/murf/AEL-trunk-fixesonly/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jun 10 11:58:36 2006
@@ -1,1 +1,1 @@
-/trunk:1-33404
+/trunk:1-33443
Modified: team/murf/AEL-trunk-fixesonly/pbx/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-trunk-fixesonly/pbx/ael/ael.flex?rev=33444&r1=33443&r2=33444&view=diff
==============================================================================
--- team/murf/AEL-trunk-fixesonly/pbx/ael/ael.flex (original)
+++ team/murf/AEL-trunk-fixesonly/pbx/ael/ael.flex Sat Jun 10 11:58:36 2006
@@ -404,7 +404,11 @@
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);
Modified: team/murf/AEL-trunk-fixesonly/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-trunk-fixesonly/pbx/ael/ael_lex.c?rev=33444&r1=33443&r2=33444&view=diff
==============================================================================
--- team/murf/AEL-trunk-fixesonly/pbx/ael/ael_lex.c (original)
+++ team/murf/AEL-trunk-fixesonly/pbx/ael/ael_lex.c Sat Jun 10 11:58:36 2006
@@ -1535,7 +1535,11 @@
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);
@@ -1568,7 +1572,7 @@
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();
@@ -1584,10 +1588,10 @@
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:
{
@@ -1818,7 +1822,7 @@
/* 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;
}
Modified: team/murf/AEL-trunk-fixesonly/pbx/pbx_gtkconsole.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-trunk-fixesonly/pbx/pbx_gtkconsole.c?rev=33444&r1=33443&r2=33444&view=diff
==============================================================================
--- team/murf/AEL-trunk-fixesonly/pbx/pbx_gtkconsole.c (original)
+++ team/murf/AEL-trunk-fixesonly/pbx/pbx_gtkconsole.c Sat Jun 10 11:58:36 2006
@@ -240,7 +240,7 @@
static void file_ok_sel(GtkWidget *w, GtkFileSelection *fs)
{
- char tmp[AST_CONFIG_MAX_PATH];
+ char tmp[PATH_MAX];
char *module = gtk_file_selection_get_filename(fs);
char buf[256];
snprintf(tmp, sizeof(tmp), "%s/", ast_config_AST_MODULE_DIR);
@@ -260,7 +260,7 @@
static void add_module(void)
{
- char tmp[AST_CONFIG_MAX_PATH];
+ char tmp[PATH_MAX];
GtkWidget *filew;
snprintf(tmp, sizeof(tmp), "%s/*.so", ast_config_AST_MODULE_DIR);
filew = gtk_file_selection_new("Load Module");
Modified: team/murf/AEL-trunk-fixesonly/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-trunk-fixesonly/utils/Makefile?rev=33444&r1=33443&r2=33444&view=diff
==============================================================================
--- team/murf/AEL-trunk-fixesonly/utils/Makefile (original)
+++ team/murf/AEL-trunk-fixesonly/utils/Makefile Sat Jun 10 11:58:36 2006
@@ -74,7 +74,7 @@
$(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 $@ $<
Modified: team/murf/AEL-trunk-fixesonly/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-trunk-fixesonly/utils/ael_main.c?rev=33444&r1=33443&r2=33444&view=diff
==============================================================================
--- team/murf/AEL-trunk-fixesonly/utils/ael_main.c (original)
+++ team/murf/AEL-trunk-fixesonly/utils/ael_main.c Sat Jun 10 11:58:36 2006
@@ -18,12 +18,10 @@
#include "asterisk/module.h"
#include "asterisk/ael_structs.h"
-#define AST_CONFIG_MAX_PATH 255
-
int conts=0, extens=0, priors=0;
char last_exten[18000];
-char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
-char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_CONFIG_DIR[PATH_MAX];
+char ast_config_AST_VAR_DIR[PATH_MAX];
void ast_add_profile(void);
void ast_cli_register_multiple(void);
More information about the svn-commits
mailing list