1 files changed, 27 insertions, 9 deletions

diff --git a/gammu/emb/common/service/backup/gsmback.c b/gammu/emb/common/service/backup/gsmback.c
index 91ac745..c94a4d2 100644
--- a/gammu/emb/common/service/backup/gsmback.c
+++ b/gammu/emb/common/service/backup/gsmback.c
@@ -64,24 +64,36 @@ void GSM_FreeBackup(GSM_Backup *backup)
 	while (backup->WAPSettings[i]!=NULL) {
 		free(backup->WAPSettings[i]);
 		backup->WAPSettings[i] = NULL;
 		i++;
 	}
 	i=0;
 	while (backup->MMSSettings[i]!=NULL) {
 		free(backup->MMSSettings[i]);
 		backup->MMSSettings[i] = NULL;
 		i++;
 	}
 	i=0;
+	while (backup->SyncMLSettings[i]!=NULL) {
+		free(backup->SyncMLSettings[i]);
+		backup->SyncMLSettings[i] = NULL;
+		i++;
+	}
+	i=0;
+	while (backup->ChatSettings[i]!=NULL) {
+		free(backup->ChatSettings[i]);
+		backup->ChatSettings[i] = NULL;
+		i++;
+	}
+	i=0;
 	while (backup->Ringtone[i]!=NULL) {
 		free(backup->Ringtone[i]);
 		backup->Ringtone[i] = NULL;
 		i++;
 	}
 	i=0;
 	while (backup->ToDo[i]!=NULL) {
 		free(backup->ToDo[i]);
 		backup->ToDo[i] = NULL;
 		i++;
 	}
 	i=0;
@@ -111,81 +123,83 @@ void GSM_FreeBackup(GSM_Backup *backup)
 		i++;
 	}
 	i=0;
 	while (backup->Note[i]!=NULL) {
 		free(backup->Note[i]);
 		backup->Note[i] = NULL;
 		i++;
 	}
 }
 
 GSM_Error GSM_SaveBackupFile(char *FileName, GSM_Backup *backup, bool UseUnicode)
 {
-	if (strstr(FileName,".lmb")) {
+	if (mystrcasestr(FileName,".lmb")) {
 		return SaveLMB(FileName,backup);
-	} else if (strstr(FileName,".vcs")) {
+	} else if (mystrcasestr(FileName,".vcs")) {
 		return SaveVCalendar(FileName,backup);
-	} else if (strstr(FileName,".vcf")) {
+	} else if (mystrcasestr(FileName,".vcf")) {
 		return SaveVCard(FileName,backup);
-	} else if (strstr(FileName,".ldif")) {
+	} else if (mystrcasestr(FileName,".ldif")) {
 		return SaveLDIF(FileName,backup);
-	} else if (strstr(FileName,".ics")) {
+	} else if (mystrcasestr(FileName,".ics")) {
 		return SaveICS(FileName,backup);
 	} else {
 		return SaveBackup(FileName,backup, UseUnicode);
 	}
 }
 
 GSM_Error GSM_ReadBackupFile(char *FileName, GSM_Backup *backup)
 {
 	FILE		*file;
 	unsigned char	buffer[300];
 
 	file = fopen(FileName, "rb");
 	if (file == NULL) return ERR_CANTOPENFILE;
 	fread(buffer, 1, 9, file); /* Read the header of the file. */
 	fclose(file);
 
 	GSM_ClearBackup(backup);
 
 	/* Attempt to identify filetype */
-	if (strstr(FileName,".vcs")) {
+	if (mystrcasestr(FileName,".vcs")) {
 		return LoadVCalendar(FileName,backup);
-	} else if (strstr(FileName,".vcf")) {
+	} else if (mystrcasestr(FileName,".vcf")) {
 		return LoadVCard(FileName,backup);
-	} else if (strstr(FileName,".ldif")) {
+	} else if (mystrcasestr(FileName,".ldif")) {
 		return LoadLDIF(FileName,backup);
-	} else if (strstr(FileName,".ics")) {
+	} else if (mystrcasestr(FileName,".ics")) {
 		return LoadICS(FileName,backup);
 	} else if (memcmp(buffer, "LMB ",4)==0) {
 		return LoadLMB(FileName,backup);
 	} else if (buffer[0] == 0xFE && buffer[1] == 0xFF) {
 		return LoadBackup(FileName,backup,true);
 	} else if (buffer[0] == 0xFF && buffer[1] == 0xFE) {
 		return LoadBackup(FileName,backup,true);
 	} else {
 		return LoadBackup(FileName,backup,false);
 	}
 }
 
 void GSM_ClearBackup(GSM_Backup *backup)
 {
 	backup->PhonePhonebook	[0] = NULL;
 	backup->SIMPhonebook	[0] = NULL;
 	backup->Calendar	[0] = NULL;
 	backup->CallerLogos	[0] = NULL;
 	backup->SMSC		[0] = NULL;
 	backup->WAPBookmark	[0] = NULL;
 	backup->WAPSettings	[0] = NULL;
 	backup->MMSSettings	[0] = NULL;
+	backup->SyncMLSettings	[0] = NULL;
+	backup->ChatSettings	[0] = NULL;
 	backup->Ringtone	[0] = NULL;
 	backup->Profiles	[0] = NULL;
 	backup->ToDo		[0] = NULL;
 	backup->GPRSPoint	[0] = NULL;
 	backup->FMStation	[0] = NULL;
 	backup->Note		[0] = NULL;
 	backup->StartupLogo	    = NULL;
 	backup->OperatorLogo	    = NULL;
 
 	backup->Creator		[0] = 0;
 	backup->IMEI		[0] = 0;
 	backup->Model		[0] = 0;
@@ -200,24 +214,26 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 	info->IMEI 		= false;
 	info->Model 		= false;
 	info->DateTime 		= false;
 	info->PhonePhonebook 	= false;
 	info->SIMPhonebook 	= false;
 	info->ToDo		= false;
 	info->Calendar 		= false;
 	info->CallerLogos 	= false;
 	info->SMSC 		= false;
 	info->WAPBookmark 	= false;
 	info->WAPSettings 	= false;
 	info->MMSSettings 	= false;
+	info->SyncMLSettings 	= false;
+	info->ChatSettings 	= false;
 	info->Ringtone 		= false;
 	info->StartupLogo 	= false;
 	info->OperatorLogo 	= false;
 	info->Profiles 		= false;
 	info->FMStation 	= false;
 	info->GPRSPoint		= false;
 	info->Note		= false;
 
 	if (strstr(FileName,".lmb")) {
 		info->PhonePhonebook 	= true;
 		info->SIMPhonebook 	= true;
 		info->CallerLogos 	= true;
@@ -237,24 +253,26 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 		info->IMEI 		= true;
 		info->Model 		= true;
 		info->DateTime 		= true;
 		info->PhonePhonebook 	= true;
 		info->SIMPhonebook 	= true;
 		info->ToDo		= true;
 		info->Calendar 		= true;
 		info->CallerLogos 	= true;
 		info->SMSC 		= true;
 		info->WAPBookmark 	= true;
 		info->WAPSettings 	= true;
 		info->MMSSettings 	= true;
+		info->SyncMLSettings 	= true;
+		info->ChatSettings 	= true;
 		info->Ringtone 		= true;
 		info->StartupLogo 	= true;
 		info->OperatorLogo 	= true;
 		info->Profiles 		= true;
  		info->FMStation 	= true;
 		info->GPRSPoint		= true;
 		info->Note		= true;
 	}
 }
 
 void GSM_GetBackupFileFeatures(char *FileName, GSM_Backup_Info *info, GSM_Backup *backup)
 {