comparison extensions/app_diameap/diameap.y @ 511:17435072de36

Search extensions conf files in the main configuration folder also
author Sebastien Decugis <sdecugis@nict.go.jp>
date Fri, 20 Aug 2010 15:18:58 +0900
parents 0c6e50a5291d
children 64e55fc10ab3
comparison
equal deleted inserted replaced
510:48d306c0db29 511:17435072de36
131 131
132 if(strlen(cfile)>0){ 132 if(strlen(cfile)>0){
133 fl = fopen(cfile, "r"); 133 fl = fopen(cfile, "r");
134 if ((fl == NULL) && (*cfile != '/')) { 134 if ((fl == NULL) && (*cfile != '/')) {
135 char * tmp = cfile; 135 char * tmp = cfile;
136 CHECK_MALLOC_DO( cfile = malloc( strlen(tmp) + strlen(DEFAULT_EXTENSIONS_PATH) + 2 ), 136 CHECK_MALLOC_DO( cfile = malloc( strlen(tmp) + strlen(DEFAULT_CONF_PATH) + 2 ),
137 { yyerror (&yylloc, config, "Not enough memory"); YYERROR; } ); 137 { yyerror (&yylloc, config, "Not enough memory"); YYERROR; } );
138 sprintf(cfile, DEFAULT_EXTENSIONS_PATH "/%s", tmp); 138 sprintf(cfile, DEFAULT_CONF_PATH "/%s", tmp);
139 free(tmp); 139 free(tmp);
140 fl = fopen(cfile, "r"); 140 fl = fopen(cfile, "r");
141 } 141 }
142 if (fl == NULL) { 142 if (fl == NULL) {
143 143
"Welcome to our mercurial repository"