diff -urN golded+-orig/golded3/gccfgg0.cpp golded+/golded3/gccfgg0.cpp --- golded+-orig/golded3/gccfgg0.cpp 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gccfgg0.cpp 2003-05-14 23:39:23 +0400 @@ -511,9 +511,6 @@ case CRC_SCREENSIZE : CfgScreensize (); break; case CRC_SEARCHFOR : CfgSearchfor (); break; case CRC_SEMAPHORE : CfgSemaphore (); break; - case CRC_SEQDIR : CfgSeqDir (); break; - case CRC_SEQMSGID : CfgSeqMsgId (); break; - case CRC_SEQOUTRUN : CfgSeqOutRun (); break; case CRC_SHAREMODE : CfgSharemode (); break; case CRC_SHOWDELETED : CfgShowdeleted (); break; case CRC_SOUNDPATH : CfgSoundpath (); break; diff -urN golded+-orig/golded3/gccfgg7.cpp golded+/golded3/gccfgg7.cpp --- golded+-orig/golded3/gccfgg7.cpp 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gccfgg7.cpp 2003-05-14 23:39:23 +0400 @@ -344,74 +344,6 @@ // ------------------------------------------------------------------ -void CfgSeqDir() { - - MapPath(PathCopy(CFG->seqdir, val)); -} - -// ------------------------------------------------------------------ - -void CfgSeqMsgId() { - - CFG->seqmsgid = GetYesno(val); -} - -// ------------------------------------------------------------------ - -void CfgSeqOutRun_Error() { - - std::cout << "* Warning: Bad SeqOutrun value \'" << val << "\', ignored."<< std::endl; -} - -void CfgSeqOutRun() { - - char *p; - ulong s = 0; - - if(not isdigit((int)(*val))) { - CfgSeqOutRun_Error(); - return; - } - - s = (ulong)atol(val); - p = val; - while(isdigit((int)(*p))) - p++; - if(*p == '\0') { - CFG->seqoutrun = s; - if(veryverbose) - std::cout << " SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun << std::endl; - return; - } - if(p[1]) { - CfgSeqOutRun_Error(); - return; - } - switch(tolower(*p)) { - case 'y': - s *= 365; - case 'd': - s *= 24; - case 'h': - s *= 60*60; - break; - case 'w': - s *= 7l*24*60*60; - break; - case 'm': - s *= 31l*24*60*60; - break; - default: - CfgSeqOutRun_Error(); - return; - } - CFG->seqoutrun = s; - if(veryverbose) - std::cout << " SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun << std::endl; -} - -// ------------------------------------------------------------------ - void CfgSharemode() { if(atoi(val)) diff -urN golded+-orig/golded3/gccfgg.cpp golded+/golded3/gccfgg.cpp --- golded+-orig/golded3/gccfgg.cpp 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gccfgg.cpp 2003-05-14 23:39:23 +0400 @@ -106,9 +106,6 @@ MakePathname(CFG->outputfile, CFG->goldpath, CFG->outputfile); MakePathname(CFG->inputfile, CFG->goldpath, CFG->inputfile); - if(*CFG->seqdir) - MakePathname(CFG->seqdir, CFG->goldpath, CFG->seqdir); - if(*CFG->souptosslog) MakePathname(CFG->souptosslog, CFG->goldpath, CFG->souptosslog); @@ -588,7 +585,6 @@ *pathreportfile = 0; *pcboardpath = 0; *quotebuffile = 0; - *seqdir = 0; *soundpath = 0; *soupexportpath = 0; *soupimportpath = 0; @@ -758,8 +754,6 @@ screenmaxcol = 0; screenmaxrow = 0; screensize = 0; - seqmsgid = MAYBE; - seqoutrun = 0; sharemode = cmdlinesharemode; showdeleted = false; soupexportmargin = 76; diff -urN golded+-orig/golded3/gccfgg.h golded+/golded3/gccfgg.h --- golded+-orig/golded3/gccfgg.h 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gccfgg.h 2003-05-14 23:39:23 +0400 @@ -318,9 +318,6 @@ const word CRC_SEARCHFOR = 0x9FA6; const word CRC_SEMAPHORE = 0x02FB; const word CRC_SERIALNO = 0x6EDE; -const word CRC_SEQDIR = 0x6426; -const word CRC_SEQMSGID = 0xFAB3; -const word CRC_SEQOUTRUN = 0x46A9; const word CRC_SHAREMODE = 0x068E; const word CRC_SHOWDELETED = 0xA9CE; const word CRC_SOUNDDEVICE = 0x831D; diff -urN golded+-orig/golded3/gcprot.h golded+/golded3/gcprot.h --- golded+-orig/golded3/gcprot.h 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gcprot.h 2003-05-14 23:39:23 +0400 @@ -303,9 +303,6 @@ void CfgScreenusebios (); void CfgSearchfor (); void CfgSemaphore (); -void CfgSeqDir (); -void CfgSeqMsgId (); -void CfgSeqOutRun (); void CfgSharemode (); void CfgShowdeleted (); void CfgSounddevice (); diff -urN golded+-orig/golded3/gecfgg.h golded+/golded3/gecfgg.h --- golded+-orig/golded3/gecfgg.h 2003-04-07 03:59:33 +0400 +++ golded+/golded3/gecfgg.h 2003-05-14 23:39:23 +0400 @@ -303,9 +303,6 @@ int screensize; INam searchfor; Semaphore semaphore; - Path seqdir; - int seqmsgid; - ulong seqoutrun; int sharemode; // share; bool showdeleted; Path soundpath; diff -urN golded+-orig/golded3/gectrl.cpp golded+/golded3/gectrl.cpp --- golded+-orig/golded3/gectrl.cpp 2003-05-03 03:02:14 +0400 +++ golded+/golded3/gectrl.cpp 2003-05-14 23:39:23 +0400 @@ -32,6 +32,7 @@ // ------------------------------------------------------------------ +static ulong msgcount = 0; int _use_fwd = true; @@ -328,7 +329,7 @@ strcpy(buf, msg->iorig); strchg(buf, '@', '.'); } - sprintf(buf2, "", getMsgId(), buf); + sprintf(buf2, "", time(NULL)+(msgcount++), buf); throw_release(msg->messageid); msg->messageid = throw_strdup(buf2); CvtMessageIDtoMSGID(buf2, buf, AA->echoid(), "MSGID"); @@ -336,7 +337,7 @@ } else { msg->orig.make_string(buf2, msg->odom); - sprintf(msg->msgids, "%s %08lx", buf2, getMsgId()); + sprintf(msg->msgids, "%s %08lx", buf2, time(NULL)+(msgcount++)); } if(CFG->switches.get(usemsgid) and not AA->ispcboard()) { sprintf(buf, "\001MSGID: %s", msg->msgids); diff -urN golded+-orig/golded3/gemsgid.cpp golded+/golded3/gemsgid.cpp --- golded+-orig/golded3/gemsgid.cpp 2003-04-10 23:50:43 +0400 +++ golded+/golded3/gemsgid.cpp 1970-01-01 03:00:00 +0300 @@ -1,57 +0,0 @@ - -// ------------------------------------------------------------------ -// GoldED+ -// Copyright (C) 2003 Alexander Reznikov, 2:4600/220@fidonet, -// -// ------------------------------------------------------------------ -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, -// MA 02111-1307 USA -// ------------------------------------------------------------------ -// $Id: gemsgid.cpp,v 1.3 2003/04/07 10:15:59 asa Exp $ -// ------------------------------------------------------------------ -// Generate MSGID. -// ------------------------------------------------------------------ - -#include -#include -// ------------------------------------------------------------------ - -static ulong msgcount = 0; - -// ------------------------------------------------------------------ - -ulong getClassicMsgId() { - - return time(NULL)+(msgcount++); -} - -// ------------------------------------------------------------------ - -ulong getMsgId() { - - ulong id; - char *err; - - if((CFG->seqmsgid == YES) or ((CFG->seqmsgid == MAYBE) and (*CFG->seqdir != NUL))) { - id = GenMsgIdEx(CFG->seqdir, CFG->seqoutrun, getClassicMsgId, &err); - if(err) { - LOG.printf("* Warning, SeqMsgId failed: %s, fall to classic algorythm!", err); - } - return id; - } - return getClassicMsgId(); -} - -// ------------------------------------------------------------------ diff -urN golded+-orig/golded3/geprot.h golded+/golded3/geprot.h --- golded+-orig/golded3/geprot.h 2003-04-07 03:59:35 +0400 +++ golded+/golded3/geprot.h 2003-05-14 23:39:23 +0400 @@ -424,13 +424,6 @@ // ------------------------------------------------------------------ -// GEMSGID prototypes - -ulong getMsgId(); -ulong getClassicMsgId(); - - -// ------------------------------------------------------------------ // SOFTCR management inline bool issoftcr(char c) { diff -urN golded+-orig/golded3/golded3.all golded+/golded3/golded3.all --- golded+-orig/golded3/golded3.all 2003-04-07 03:59:35 +0400 +++ golded+/golded3/golded3.all 2003-05-14 23:42:11 +0400 @@ -64,7 +64,6 @@ gemnus cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be gemrks cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be gemsgs cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be -gemsgid cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be genode cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be geplay cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be gepost cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be diff -urN golded+-orig/golded3/Makefile golded+/golded3/Makefile --- golded+-orig/golded3/Makefile 2003-04-07 03:59:33 +0400 +++ golded+/golded3/Makefile 2003-05-14 23:39:23 +0400 @@ -3,8 +3,8 @@ TOP=.. SHORTTARGET=ged TARGET=golded3 -GLIBS=gmb3 gall gcfg uulib smblib msgidlib -INCS=-I. -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/msgidlib +GLIBS=gmb3 gall gcfg uulib smblib +INCS=-I. -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/smblib ifeq ($(findstring EMX, $(PATH)), EMX) STDLIBS=-los2me -lstdcpp diff -urN golded+-orig/Makefile golded+/Makefile --- golded+-orig/Makefile 2003-04-07 03:58:55 +0400 +++ golded+/Makefile 2003-05-14 23:39:23 +0400 @@ -4,7 +4,7 @@ .PHONY: all clean distclean dirs sourcelists deps -LIBS=gall gcfg gmb3 glibc uulib smblib msgidlib +LIBS=gall gcfg gmb3 glibc uulib smblib EXECUTABLES=golded3 goldnode rddt all: sourcelists