From 8ff62393996015e76d1e60227582cb690d9ef182 Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Mon, 3 Dec 2001 22:31:10 +0000
Subject: [PATCH] Added AREAFILE to Crashecho and environment expansion to
 Fidoconfig

---
 docs/notework.txt        | 6 ++++++
 goldlib/gcfg/gxcrash.cpp | 9 +++++++++
 goldlib/gcfg/gxhpt.cpp   | 4 ++++
 3 files changed, 19 insertions(+)

diff --git a/docs/notework.txt b/docs/notework.txt
index c04088d..aabaeb6 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,12 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- GoldED+ should now recognize AREAFILE keyword in CrashEcho config
+  (not tested).
+
+- GoldED+ should now recognize environment variables in INCLUDE and
+  area path definitions in Fidoconfig (not tested).
+
 - Fixed small bug in goldkeys.cfg parser so the last line without
   the feed was incorrectly processed.
 
diff --git a/goldlib/gcfg/gxcrash.cpp b/goldlib/gcfg/gxcrash.cpp
index 35cfc99..c8b3f15 100644
--- a/goldlib/gcfg/gxcrash.cpp
+++ b/goldlib/gcfg/gxcrash.cpp
@@ -111,12 +111,17 @@ void gareafile::ReadCrashmail(char* tag) {
 
     const word CRC_AKA = 0x13A4;
     const word CRC_AREA = 0x010B;
+#ifndef GCFG_NOCECHO
+    const word CRC_AREAFILE = 0xB487;
+#endif
     const word CRC_LOCALAREA = 0xAEC1;
     const word CRC_DESCRIPTION = 0x2DF1;
     const word CRC_DOMAIN = 0xFFCA;
     const word CRC_GROUP = 0x1C9B;
     const word CRC_NETMAIL = 0xE42E;
+#ifndef GCFG_NOCECHO
     const word CRC_NETMAILDIR = 0x180A;
+#endif
     const word CRC_SYSOP = 0x967F;
     const word CRC_UNCONFIRMED = 0x195E;
 
@@ -145,6 +150,10 @@ void gareafile::ReadCrashmail(char* tag) {
           jbstrcpy(domain, buf, 50, &jbcpos);
           break;
 #ifndef GCFG_NOCECHO
+        case CRC_AREAFILE:
+          jbstrcpy(tmp, buf, 100, &jbcpos);
+          ReadCrashmail(tmp);
+          break;
         case CRC_NETMAILDIR:
           if(aa.type != 0xff) {
             if(not unconfirmed)
diff --git a/goldlib/gcfg/gxhpt.cpp b/goldlib/gcfg/gxhpt.cpp
index 813c5d5..7d18c1a 100644
--- a/goldlib/gcfg/gxhpt.cpp
+++ b/goldlib/gcfg/gxhpt.cpp
@@ -214,6 +214,8 @@ void gareafile::ReadHPTFile(char* path, char* file, char* options, char* origin,
             break;
           case CRC_INCLUDE:
             strxcpy(buf2, val, sizeof(buf2));
+            if(strchg(buf2, '[', '%') != 0)
+              strchg(buf2, ']', '%');
             MakePathname(buf2, path, buf2);
             ReadHPTFile(path, buf2, options, origin, group);
             break;
@@ -249,6 +251,8 @@ void gareafile::ReadHPTFile(char* path, char* file, char* options, char* origin,
           // If not pass-through
           if(not strieql("Passthrough", key)) {
 
+            if(strchg(key, '[', '%') != 0)
+              strchg(key, ']', '%');
             aa.setpath(key);
             aa.msgbase = fidomsgtype;
             aa.groupid = group;