Latest changes

cfgs/config/goldlang.cfg

@@ -357,6 +357,7 @@ IL_NOAKADEFINED       " No AKA's defined. Press key "
 IL_NOTPLDEFINED       " No templates defined. Press key "
 IL_NOTHREADLIST       " Sorry, no thread available. Press key "
 MS_SKIPPINGTWIT       "Skipping Twit Message..."
+MS_SKIPPINGDELETED    "Skipping Deleted Message..."
 MS_KILLINGTWIT        "Killing Twit Message..."
 IL_WRITINGCFG         " Writing Configuration "
 IL_COULDNOTOPEN       " Couldn't open %s "

cfgs/config/goldlang.ger

@@ -379,6 +379,8 @@ IL_NOAKADEFINED      " Keine AKAs definiert. Taste dr
 IL_NOTPLDEFINED      " Keine Vorlagen definiert. Taste dr<64>cken "
 IL_NOTHREADLIST      " Schade, keine Antworten vorhanden. Taste dr<64>cken "
 MS_SKIPPINGTWIT      "šberspringe Twitmails.."
+// ???
+MS_SKIPPINGDELETED   "šberspringe L”schenmails.."
 MS_KILLINGTWIT       "L”sche Twitmails.."
 IL_WRITINGCFG        " Schreibe Konfiguration "
 IL_COULDNOTOPEN      " Kann %s nicht ”ffnen "

cfgs/config/goldlang.it

@@ -390,6 +390,8 @@ IL_NOAKADEFINED      " Nessuna AKA definito. Premi un tasto "
 IL_NOTPLDEFINED      " Nessun template definito. Premi un tasto "
 IL_NOTHREADLIST      " Nessana catena delle repliche. Premi un tasto"
 MS_SKIPPINGTWIT      "Salto i messaggi Twit..."
+// ???
+MS_SKIPPINGDELETED   "Salto i messaggi cancello..."
 MS_KILLINGTWIT       "Cancello i messaggi Twit..."
 IL_WRITINGCFG        " Scrivo la configurazione "
 IL_COULDNOTOPEN      " Non posso aprire %s "

cfgs/config/goldlang.nl

@@ -371,6 +371,8 @@ IL_NOAKADEFINED      " Geen AKA's defined. Press key "
 IL_NOTPLDEFINED      " No templates gedefinieerd. Druk Toets "
 IL_NOTHREADLIST      " Sorry, geen berichtenserie beschikbaar. Druk Toets "
 MS_SKIPPINGTWIT      "Slaat Twit bericht over..."
+// ???
+MS_SKIPPINGDELETED   "Slaat deleted bericht over..."
 MS_KILLINGTWIT       "Delete Twit Bericht..."
 IL_WRITINGCFG        " Schrijft Configuratie weg "
 IL_COULDNOTOPEN      " Kon %s niet openen "

cfgs/config/goldlang.ru2

@@ -400,6 +400,7 @@ IL_NOAKADEFINED       "
 IL_NOTPLDEFINED       " \"<22>ë¡ë\" ­¥ ®¯à¥¤¥«¥­ë. <20> ¦¬¨â¥ ª« ¢¨èã "
 IL_NOTHREADLIST       " ˆ§¢¨­¨â¥, ¤¥à¥¢® ®â¢¥â®¢ ­¥¤®áâ㯭®. <20> ¦¬¨â¥ ª« ¢¨èã "
 MS_SKIPPINGTWIT       "<22>யã᪠¨¤¨®â᪨å á®®¡é¥­¨©..."
+MS_SKIPPINGDELETED    "<22>யã᪠㤠«ñ­­ëå á®®¡é¥­¨©..."
 MS_KILLINGTWIT        "“¤ «¥­¨¥ ¨¤¨®â᪨å á®®¡é¥­¨©..."
 IL_WRITINGCFG         " ‡ ¯¨áì ª®­ä¨£ãà æ¨¨ "
 IL_COULDNOTOPEN       " <20>¥¢®§¬®¦­® ®âªàëâì %s "

cfgs/config/goldlang.ru3

@@ -615,6 +615,7 @@ WT_LOOKUP            "
 WL_PHONE             "’¥«¥ä®­:"
 MS_EDITCMD           "<22>¥¤ ªâ®à: %s"
 MS_SKIPPINGTWIT      " <20>யã᪠­¥¦¥« â¥«ì­ëå á®®¡é¥­¨©..."
+MS_SKIPPINGDELETED   " <20>யã᪠㤠«ñ­­ëå á®®¡é¥­¨©..."
 ST_LOADUNFINISHED    "<22> ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¥£® § £à㧪¨ ¨«¨ <ESC> ¤«ï 㤠«¥­¨ï"
 MS_HIDINGTWIT        "<22>¥¦¥« â¥«ì­®¥ á®®¡é¥­¨ï - ¤«ï ¯à®ç⥭¨ï ­ ¦¬¨â¥ <Home> "
 MS_KILLINGTWIT       "“¤ «¥­¨¥ ­¥¦¥« â¥«ì­®£® á®®¡é¥­¨ï"

cfgs/config/goldlang.rus

@@ -396,6 +396,7 @@ IL_NOAKADEFINED       "
 IL_NOTPLDEFINED       " \"<22>ë¡ë\" ­¥ ®¯à¥¤¥«¥­ë. <20> ¦¬¨â¥ ª« ¢¨èã "
 IL_NOTHREADLIST       " ˆ§¢¨­¨â¥, ¤¥à¥¢® ®â¢¥â®¢ ­¥¤®áâ㯭®. <20> ¦¬¨â¥ ª« ¢¨èã "
 MS_SKIPPINGTWIT       "<22>யã᪠¨¤¨®â᪨å á®®¡é¥­¨©..."
+MS_SKIPPINGDELETED    "<22>யã᪠㤠«ñ­­ëå á®®¡é¥­¨©..."
 MS_KILLINGTWIT        "“¤ «¥­¨¥ ¨¤¨®â᪨å á®®¡é¥­¨©..."
 IL_WRITINGCFG         " ‡ ¯¨áì ª®­ä¨£ãà æ¨¨ "
 IL_COULDNOTOPEN       " <20>¥¢®§¬®¦­® ®âªàëâì %s "

cfgs/config/goldlang.sv

@@ -370,6 +370,8 @@ IL_NOAKADEFINED      " Inga adresser definierade. Tryck tangent "
 IL_NOTPLDEFINED      " Inga mallar definierade. Tryck tangent "
 IL_NOTHREADLIST      " Inget träd tillgänglig. Tryck tangent "
 MS_SKIPPINGTWIT      "Hoppar över filtrerade texter..."
+//
+MS_SKIPPINGDELETED   "Hoppar över dödas texter..."
 MS_KILLINGTWIT       "Dödar filtrerade texter..."
 IL_WRITINGCFG        " Skriver inställningar "
 IL_COULDNOTOPEN      " Kunde inte öppna %s "

docs/notework.txt

@@ -12,6 +12,20 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ Added escape sequences \" and \\ to the goldkeys.cfg.
+
++ A bit changed algorithm of processing soft-deleted messages, added
+  MS_SkippingDeleted keyword to the language file.
+
+! Added possibility to use double quotes within macros. You need to
+  write \" within quoted string. The backslash escapes only double
+  quotes and backslash to minimize impact on users. Please scan your
+  goldkeys.cfg for \" and \\ and change them to \\" and \\\\
+  accordingly before upgrading.
+
+- Fixed reading of Crashmail/Crashecho config when file saved as DOS
+  file.
+
 - Fixed newly introduced bug in copying/moving Opus mail.
 
 - Fixed CRC16 routine for Synchronet fields updating.

golded3/gckeys.cpp

@@ -1052,6 +1052,9 @@ int ReadKeysCfg(int force) {
             if(*ptr == '\"') {  // Start of literal string
               ptr++;
               while((*ptr != '\"') and (n < (sizeof(tmp2.buf)/sizeof(gkey)))) {
+                // allow '\"' and '\\' in config
+                if((ptr[0] == '\\') and ((ptr[1] == '\"') or (ptr[1] == '\\')))
+                  ptr++;
                 ch = *ptr++;
                 tmp2.buf[n++] = (gkey)(ch | (scancode(ch) << 8));
               }

golded3/gclang.cpp

@@ -337,6 +337,7 @@ static LangCrc LangCrcs[] = {
   { CRC_IL_NOTPLDEFINED       , NULL  , " No templates defined. Press key " },
   { CRC_IL_NOTHREADLIST       , NULL  , " Sorry, no thread available. Press key "},
   { CRC_MS_SKIPPINGTWIT       , NULL  , "Skipping Twit Message..." },
+  { CRC_MS_SKIPPINGDELETED    , NULL  , "Skipping Deleted Message..." },
   { CRC_MS_KILLINGTWIT        , NULL  , "Killing Twit Message..." },
   { CRC_IL_WRITINGCFG         , NULL  , " Writing Configuration " },
   { CRC_IL_COULDNOTOPEN       , NULL  , " Couldn't open %s " },

golded3/gedoss.cpp

@@ -218,7 +218,7 @@ int ShellToDos(char* command, char* message, int cls, int cursor, int pause) {
   int error = 0;
 
   #if defined(GUTLOS_FUNCS)
-  char ge_temptitle[GMAXTITLE];
+  char ge_temptitle[GMAXTITLE+1];
   #endif
 
   #ifndef __UNIX__

golded3/gelang.h

@@ -324,6 +324,7 @@ struct LangGed {
   char*  NoTplDefined;       // IL_NOTPLDEFINED
   char*  NoThreadlist;       // IL_NOTHREADLIST
   char*  SkippingTwit;       // MS_SKIPPINGTWIT
+  char*  SkippingDeleted;    // MS_SKIPPINGDELETED
   char*  KillingTwit;        // MS_KILLINGTWIT
   char*  WritingCfg;         // IL_WRITINGCFG
   char*  CouldNotOpen;       // IL_COULDNOTOPEN

golded3/geread.cpp

@@ -367,7 +367,12 @@ void Reader() {
                 }
               }
               else {
+                if(CFG->showdeleted or not msg->attr.del())
                   BodyView->Paint();
+                else {
+                  BodyView->window.clear();
+                  BodyView->window.prints(1, 0, C_READW, LNG->SkippingDeleted);
+                }
               }
 
               if(reader_rcv_noise) {

goldlib/gall/gutlbeos.cpp

@@ -37,7 +37,7 @@
 
 //  ------------------------------------------------------------------
 
-char          ge_beos_title[GMAXTITLE] = "";
+char          ge_beos_title[GMAXTITLE+1] = "";
 int           ge_beos_ext_title;
 
 static BClipboard g_clipboard("system", true);
@@ -63,8 +63,7 @@ void g_deinit_os(void) {
 
 void g_init_title(char *tasktitle, int titlestatus) {
 
-  strncpy(ge_beos_title, tasktitle, GMAXTITLE);
+  strxcpy(ge_beos_title, tasktitle, GMAXTITLE);
-  ge_beos_title[GMAXTITLE-1] = '\0';
   ge_beos_ext_title = titlestatus;
 }
 
@@ -164,15 +163,14 @@ void g_get_ostitle_name(char* title) {
 void g_set_ostitle_name(char* title, int mode) {
 
   if(mode == 0) {
-    char fulltitle[GMAXTITLE];
+    char fulltitle[GMAXTITLE+1];
     strcpy(fulltitle, ge_beos_title);
     if(ge_beos_ext_title) {
       int len = strlen(fulltitle);
-      if(len < GMAXTITLE-4) {
+      if(len < GMAXTITLE-3) {
         if(len)
           strcat(fulltitle, " - ");
-        strncpy(fulltitle+len+3, title, GMAXTITLE-len-3);
+        strxcpy(fulltitle+len+3, title, GMAXTITLE-len-3);
-        fulltitle[GMAXTITLE-1] = '\0';
       }
     }
     g_set_ostitle(fulltitle);

goldlib/gall/gutldos.cpp

@@ -49,8 +49,8 @@ enum OSAPI {
 };
 
 OSAPI         winapi;
-char          ge_win_oldtitle[GMAXTITLE] = "";
+char          ge_win_oldtitle[GMAXTITLE+1] = "";
-char          ge_win_title[GMAXTITLE] = "";
+char          ge_win_title[GMAXTITLE+1] = "";
 int           ge_win_ext_title;
 
 

goldlib/gall/gutlos2.cpp

@@ -77,9 +77,9 @@ HMODULE           ge_os2_mdmHandle = 0;
 SWCNTRL           ge_os2_swolddata;
 SWCNTRL           ge_os2_swdata;
 SZ                ge_os2_loaderr[256];
-char              ge_os2_coldtitle[GMAXTITLE] = "";
+char              ge_os2_coldtitle[GMAXTITLE+1] = "";
 HPOINTER          ge_os2_coldicon;
-char              ge_os2_title[GMAXTITLE] = "";
+char              ge_os2_title[GMAXTITLE+1] = "";
 int               ge_os2_ext_title;
 ULONG             ge_os2_oldicon;
 
@@ -290,11 +290,11 @@ void g_get_ostitle_name(char *currtitle) {
 void g_set_ostitle_name(char *title, int mode) {
 
   if(mode == 0) {
-    char fulltitle[80];
+    char fulltitle[GMAXTITLE+1];
     strcpy(fulltitle, ge_os2_title);
     if(ge_os2_ext_title) {
       int len = strlen(fulltitle);
-      if(len < GMAXTITLE-4) {
+      if(len < GMAXTITLE-3) {
         if(len)
           strcat(fulltitle, " - ");
         strxcpy(fulltitle+len+3, title, GMAXTITLE-len-3);

goldlib/gall/gutlwin.cpp

@@ -42,8 +42,8 @@
 //  ------------------------------------------------------------------
 
 OSVERSIONINFO WinVer;
-char          ge_win_coldtitle[GMAXTITLE] = "";
+char          ge_win_coldtitle[GMAXTITLE+1] = "";
-char          ge_win_title[GMAXTITLE] = "";
+char          ge_win_title[GMAXTITLE+1] = "";
 int           ge_win_ext_title;
 
 char          tu[256] = {
@@ -196,8 +196,7 @@ void g_deinit_os(void) {
 
 void g_init_title(char* tasktitle, int titlestatus) {
 
-  strncpy(ge_win_title, tasktitle, GMAXTITLE);
+  strxcpy(ge_win_title, tasktitle, GMAXTITLE);
-  ge_win_title[GMAXTITLE-1] = '\0';
   ge_win_ext_title = titlestatus;
 }
 
@@ -339,15 +338,14 @@ void g_get_ostitle_name(char *title) {
 void g_set_ostitle_name(char *title, int mode) {
 
   if(mode == 0) {
-    char fulltitle[GMAXTITLE];
+    char fulltitle[GMAXTITLE+1];
     strcpy(fulltitle, ge_win_title);
     if(ge_win_ext_title) {
       int len = strlen(fulltitle);
-      if(len < GMAXTITLE-4) {
+      if(len < GMAXTITLE-3) {
         if(len)
           strcat(fulltitle, " - ");
-        strncpy(fulltitle+len+3, title, GMAXTITLE-len-3);
+        strxcpy(fulltitle+len+3, title, GMAXTITLE-len-3);
-        fulltitle[GMAXTITLE-1] = '\0';
       }
     }
     g_set_ostitle(fulltitle);

goldlib/gcfg/gxcrash.cpp

@@ -75,7 +75,7 @@ bool gareafile::jbstrcpy(char *dest, char *src, size_t maxlen, size_t *jbc) {
 
 void gareafile::ReadCrashmailCfg(const char* file) {
 
-  FILE* fp = fsopen(file, "rb", sharemode);
+  FILE* fp = fsopen(file, "rt", sharemode);
   if(fp) {
     setvbuf(fp, NULL, _IOFBF, 8192);