Merge branch 'master' of git.linphone.org:linphone

diff --git a/README.mingw b/README.mingw
index 5fa56c8445a15a6628dbe458bf4aff55f0612070..a81d056f405346dfa177b2894a509bd305e408f0 100644 (file)
--- a/README.mingw
+++ b/README.mingw
@@ -51,7 +51,7 @@ rm /lib/libgcc.a /lib/libmingw32.a /lib/libmingwex.a
 rm /lib/libintl.dll.a
 rm /lib/libintl.la
 rm /lib/libintl.a
-rm /include/intl.h
+rm /include/libintl.h
 
 * Download and install Inno Setup Compiler (required only if you run 'make setup.exe'). Add it to your windows Path environment variable.
 

diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index 0de019e57fdb9fd9cc06c98137f7bbd5df5d8125..f4eca33fecf7a8f0cf2369596061eda742ce93ec 100644 (file)
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -22,7 +22,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define MAX_LEN 32768
+#define MAX_LEN 4096
 
 #include "linphonecore.h"
 
@@ -138,14 +138,18 @@ LpItem *lp_section_find_item(LpSection *sec, const char *name){
 }
 
 void lp_config_parse(LpConfig *lpconfig, FILE *file){
-       char tmp[MAX_LEN];
+       ms_error("Entering lp_config_parse");
+       char tmp[MAX_LEN]= {'\0'};
        LpSection *cur=NULL;
 
        if (file==NULL) return;
 
+       ms_message("Entering While");
        while(fgets(tmp,MAX_LEN,file)!=NULL){
+               tmp[sizeof(tmp) -1] = '\0';
                char *pos1,*pos2;
                pos1=strchr(tmp,'[');
+               ms_message("Pos1 = %s", pos1);
                if (pos1!=NULL && is_first_char(tmp,pos1) ){
                        pos2=strchr(pos1,']');
                        if (pos2!=NULL){