1 files changed, 64 insertions, 17 deletions

diff --git a/gammu/emb/gammu/smsd/s_files.c b/gammu/emb/gammu/smsd/s_files.c
index dac8d9c..b791e58 100644
--- a/gammu/emb/gammu/smsd/s_files.c
+++ b/gammu/emb/gammu/smsd/s_files.c
@@ -1,7 +1,7 @@
-/* (c) 2002-2003 by Joergen Thomsen */
+/* (c) 2002-2004 by Joergen Thomsen */
 
 #include "../../cfg/config.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -103,35 +103,44 @@ static GSM_Error SMSDFiles_SaveInboxSMS(GSM_MultiSMSMessage sms, GSM_SMSDConfig
         }
         return ERR_NONE;
 }
 
 /* Find one multi SMS to sending and return it (or return ERR_EMPTY)
  * There is also set ID for SMS
+ * File extension convention:
+ * OUTxxxxx.txt : normal text SMS
+ * Options appended to the extension applying to this SMS only:
+ * d: delivery report requested
+ * f: flash SMS
+ * b: WAP bookmark as name,URL
+ * e.g. OUTG20040620_193810_123_+4512345678_xpq.txtdf
+ * is a flash text SMS requesting delivery reports
  */
 static GSM_Error SMSDFiles_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID)
 {
                 GSM_Error               error = ERR_NOTSUPPORTED;
                 GSM_MultiPartSMSInfo    SMSInfo;
+                GSM_WAPBookmark                 Bookmark;
                 unsigned char           FileName[100],FullName[400];
                 unsigned char           Buffer[(GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS+1)*2];
                 unsigned char           Buffer2[(GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS+1)*2];
                 FILE                    *File;
                 int                     i, len, phlen;
-                char                    *pos1, *pos2;
+                char                    *pos1, *pos2, *options;
 #if defined HAVE_DIRENT_H && defined HAVE_SCANDIR & defined HAVE_ALPHASORT
                 struct                          dirent **namelist = NULL;
                 int                     l, m ,n;
 
           strcpy(FullName, Config->outboxpath);
           FullName[strlen(Config->outboxpath)-1] = '\0';
           n = scandir(FullName, &namelist, 0, alphasort);
           m = 0;
-         while ((m < n) && ((*(namelist[m]->d_name) == '.') ||
-                            !mystrncasecmp(namelist[m]->d_name,"out", 3) ||
+         while ((m < n) && ((*(namelist[m]->d_name) == '.') || // directory and UNIX hidden file
+                            !mystrncasecmp(namelist[m]->d_name,"out", 3) || // must start with 'out'
                             ((strlen(namelist[m]->d_name) >= 4) &&
-                              !mystrncasecmp(&namelist[m]->d_name[strlen(namelist[m]->d_name)-4],".txt",4)
+                             !mystrncasecmp(strrchr(namelist[m]->d_name, '.'),".txt",4)
                             )
                            )
                ) m++;
           if (m < n) strcpy(FileName,namelist[m]->d_name);
           for (l=0; l < n; l++) free(namelist[l]);
           free(namelist);
@@ -141,58 +150,91 @@ static GSM_Error SMSDFiles_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfi
 #else
 #ifdef WIN32
                 struct _finddata_t      c_file;
                 long                    hFile;
 
           strcpy(FullName, Config->outboxpath);
-          strcat(FullName, "OUT*.txt");
+          strcat(FullName, "OUT*.txt*");
           if((hFile = _findfirst( FullName, &c_file )) == -1L ) {
                 return ERR_EMPTY;
           } else {
                 strcpy(FileName,c_file.name);
           }
           _findclose( hFile );
         error = ERR_NONE;
 #endif
 #endif
         if (error != ERR_NONE) return error;
-
+        options = strrchr(FileName, '.') + 4;
           strcpy(FullName, Config->outboxpath);
           strcat(FullName, FileName);
 
           File = fopen(FullName, "rb");
          len  = fread(Buffer, 1, sizeof(Buffer)-2, File);
           fclose(File);
-          if (len<2) return ERR_EMPTY;
 
-         if ((Buffer[0] != 0xFF || Buffer[1] != 0xFE) &&
-            (Buffer[0] != 0xFE || Buffer[1] != 0xFF)) {
+         if ((len <  2) || 
+            (len >= 2  && ((Buffer[0] != 0xFF || Buffer[1] != 0xFE) &&
+                           (Buffer[0] != 0xFE || Buffer[1] != 0xFF)))) {
                 if (len > GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS) len = GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS;
                 EncodeUnicode(Buffer2, Buffer, len);
                 len = len*2;
                 memmove(Buffer, Buffer2, len);
          }
 
                 Buffer[len] = 0;
                 Buffer[len+1] = 0;
           ReadUnicodeFile(Buffer2,Buffer);
 
+            GSM_ClearMultiPartSMSInfo(&SMSInfo);
+            sms->Number = 0;
+
                 SMSInfo.ReplaceMessage  = 0;
                 SMSInfo.Entries[0].Buffer= Buffer2;
                 SMSInfo.Class           = -1;
                 SMSInfo.EntriesNum      = 1;
+                Config->currdeliveryreport= -1;
+                if (strchr(options, 'd')) Config->currdeliveryreport= 1;
+                if (strchr(options, 'f')) SMSInfo.Class         = 0; /* flash SMS */
+
          if (mystrncasecmp(Config->transmitformat, "unicode", 0)) {
                 SMSInfo.Entries[0].ID = SMS_ConcatenatedTextLong;
                 SMSInfo.UnicodeCoding = true;
          } else if (mystrncasecmp(Config->transmitformat, "7bit", 0)) {
                 SMSInfo.Entries[0].ID = SMS_ConcatenatedTextLong;
                 SMSInfo.UnicodeCoding = false;
          } else {
                 /* auto */
                 SMSInfo.Entries[0].ID = SMS_ConcatenatedAutoTextLong;
         }
+
+        if (strchr(options, 'b')) { // WAP bookmark as title,URL
+                        SMSInfo.Entries[0].Buffer       = NULL;
+                        SMSInfo.Entries[0].Bookmark     = &Bookmark;
+                        SMSInfo.Entries[0].ID           = SMS_NokiaWAPBookmarkLong;
+                        SMSInfo.Entries[0].Bookmark->Location= 0;
+                pos2 = mywstrstr(Buffer2, "\0,");
+                if (pos2 == NULL) {
+                        pos2 = Buffer2;
+                } else {
+                        *pos2 = '\0'; pos2++; *pos2 = '\0'; pos2++; // replace comma by zero
+                }
+
+                len = UnicodeLength(Buffer2);
+                if (len > 50) len = 50;
+                memmove(&SMSInfo.Entries[0].Bookmark->Title, Buffer2, len * 2);
+                pos1 = &SMSInfo.Entries[0].Bookmark->Title[0] + len * 2;
+                *pos1 = '\0'; pos1++; *pos1 = '\0';
+
+                len = UnicodeLength(pos2);
+                if (len > 255) len = 255;
+                memmove(&SMSInfo.Entries[0].Bookmark->Address, pos2, len * 2);
+                pos1 = &SMSInfo.Entries[0].Bookmark->Address[0] + len * 2;
+                *pos1 = '\0'; pos1++; *pos1 = '\0';
+        }
+
           GSM_EncodeMultiPartSMS(&SMSInfo,sms);
 
          pos1 = FileName;
         strcpy(ID,FileName);
          for (i = 1; i <= 3 && pos1 != NULL ; i++) pos1 = strchr(++pos1, '_');
          if (pos1 != NULL) {
@@ -227,21 +269,23 @@ static GSM_Error SMSDFiles_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfi
                 EncodeUnicode(sms->SMS[len].Number, pos1, phlen);
          }
 
 #ifdef DEBUG
         if (sms->Number != 0) {
                 DecodeUnicode(sms->SMS[0].Number,Buffer);
-                 dbgprintf("Found %i sms to \"%s\" with text \"%s\" cod %i lgt %i udh: t %i l %i\n",
+                 dbgprintf("Found %i sms to \"%s\" with text \"%s\" cod %i lgt %i udh: t %i l %i dlr: %i fls: %i",
                         sms->Number,
                         Buffer,
                         DecodeUnicodeString(sms->SMS[0].Text),
                         sms->SMS[0].Coding,
                         sms->SMS[0].Length,
                         sms->SMS[0].UDH.Type,
-                        sms->SMS[0].UDH.Length);
-        } else dbgprintf("error\n");
+                        sms->SMS[0].UDH.Length,
+                        Config->currdeliveryreport,
+                        SMSInfo.Class);
+        } else dbgprintf("error: SMS-count = 0");
 #endif
 
           return ERR_NONE;
 }
 
 /* After sending SMS is moved to Sent Items or Error Items. */
@@ -289,25 +333,28 @@ static GSM_Error SMSDFiles_MoveSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Con
                                 WriteSMSDLog("Could not delete %s (%i)", ifilename, errno);
                 }
                 return ERR_UNKNOWN;
         }
 }
 
-static GSM_Error SMSDFiles_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, bool OK)
+static GSM_Error SMSDFiles_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, GSM_SMSDSendingError err, int TPMR)
 {
-        if (OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
+        if (err == SMSD_SEND_OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
 
           return ERR_NONE;
 }
 
 GSM_SMSDService SMSDFiles = {
                 NONEFUNCTION,                   /* Init         */
+                NONEFUNCTION,                   /* InitAfterConnect */
         SMSDFiles_SaveInboxSMS,
         SMSDFiles_FindOutboxSMS,
         SMSDFiles_MoveSMS,
                 NOTSUPPORTED,                   /* CreateOutboxSMS*/
-        SMSDFiles_AddSentSMSInfo
+        SMSDFiles_AddSentSMSInfo,
+                NOTSUPPORTED,                   /* RefreshSendStatus*/
+                NOTSUPPORTED                    /* RefreshPhoneStatus*/
 };
 
-/* How should editor hadle tabs in this file? Add editor commands here.
+/* How should editor handle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */