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
@@ -70,12 +70,24 @@ void GSM_FreeBackup(GSM_Backup *backup)
         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;
@@ -117,21 +129,21 @@ void GSM_FreeBackup(GSM_Backup *backup)
                 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);
         }
 }
 
@@ -145,19 +157,19 @@ GSM_Error GSM_ReadBackupFile(char *FileName, GSM_Backup *backup)
         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) {
@@ -174,12 +186,14 @@ void GSM_ClearBackup(GSM_Backup *backup)
                 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;
@@ -206,12 +220,14 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
                 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;
@@ -243,12 +259,14 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
                         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;