From d95538c3e510e6497949f51ed2b8b7d2cbe7ac8e Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Sun, 10 Dec 2000 08:29:00 +0000
Subject: [PATCH] Fixed incorrect Macro processing, stripping spaces around
 origin, bit stablized crashmail parser

---
 golded3/geglob.cpp       |  4 ++--
 golded3/gemenu.cpp       |  1 +
 goldlib/gcfg/gxcrash.cpp | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/golded3/geglob.cpp b/golded3/geglob.cpp
index 876a5c2..ad88703 100644
--- a/golded3/geglob.cpp
+++ b/golded3/geglob.cpp
@@ -258,7 +258,7 @@ int IsMacro(gkey key, int type) {
 
   vector<Macro>::iterator m = CFG->macro.begin();
   while(m != CFG->macro.end()) {
-    if((key == m->key) and (type == m->type))
+    if(((key == m->key) or (tolower(key) == m->key) or (toupper(key) == m->key)) and (type == m->type))
       return true;
     m++;
   }
@@ -273,7 +273,7 @@ int PlayMacro(gkey key, int type) {
 
   vector<Macro>::iterator m = CFG->macro.begin();
   while(m != CFG->macro.end()) {
-    if((key == m->key) and (type == m->type)) {
+    if(((key == m->key) or (tolower(key) == m->key) or (toupper(key) == m->key)) and (type == m->type)) {
       RunMacro(m);
       return true;
     }
diff --git a/golded3/gemenu.cpp b/golded3/gemenu.cpp
index c8775fc..8c487c3 100644
--- a/golded3/gemenu.cpp
+++ b/golded3/gemenu.cpp
@@ -530,6 +530,7 @@ int SelectFromFile(const char* file, char* selection, const char* title, const c
     if(n != -1) {
       strcpy(selection, Listi[n]);
       strtrim(selection);
+      strltrim(selection);
       retval = true;
     }
     for(n=0; n<lines; n++)
diff --git a/goldlib/gcfg/gxcrash.cpp b/goldlib/gcfg/gxcrash.cpp
index 27d07a5..acafe45 100644
--- a/goldlib/gcfg/gxcrash.cpp
+++ b/goldlib/gcfg/gxcrash.cpp
@@ -108,6 +108,7 @@ void gareafile::ReadCrashmail(char* tag) {
     aa.reset();
     aa.type = 0xff;
     address[0] = NUL;
+    domain[0] = NUL;
 
     const word CRC_AKA = 0x13A4;
     const word CRC_AREA = 0x010B;
@@ -151,6 +152,12 @@ void gareafile::ReadCrashmail(char* tag) {
               AddNewArea(aa);
             aa.reset();
           }
+          unconfirmed = false;
+          jbstrcpy(tmp, buf, 100, &jbcpos);
+          if(strieql(tmp, "DEFAULT") or strnieql(tmp, "DEFAULT_", 8)) {
+            aa.type = 0xff;
+            break;
+          }
           switch(crc16) {
             case CRC_NETMAIL:
               aa.type = GMB_NET;
@@ -165,10 +172,6 @@ void gareafile::ReadCrashmail(char* tag) {
               aa.attr = attribslocal;
               break;
           }
-          unconfirmed = false;
-          jbstrcpy(tmp, buf, 100, &jbcpos);
-          if(strieql(tmp, "DEFAULT") or strnieql(tmp, "DEFAULT_", 8))
-            break;
           aa.setechoid(tmp);
           jbstrcpy(tmp, buf, 50, &jbcpos);
           aa.aka = primary_aka;