Merge branch 'from-hg'

mbfido/Makefile

@@ -1,6 +1,6 @@
 # Makefile for MBSE BBS under Linux
 # Copyright (c) 1998, 2001 by M. Broek.
-# $Id$
+# $Id: Makefile,v 1.74 2008/02/17 17:50:14 mbse Exp $
 
 include ../Makefile.global
 

mbfido/addbbs.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: addbbs.c,v 1.39 2007/03/07 20:05:30 mbse Exp $
  * Purpose ...............: Add TIC file to the BBS
  *
  *****************************************************************************

mbfido/addbbs.h

@@ -1,7 +1,7 @@
 #ifndef	_ADDBBS_H
 #define	_ADDBBS_H
 
-/* $Id$ */
+/* $Id: addbbs.h,v 1.2 2004/07/16 20:21:23 mbse Exp $ */
 
 
 int Add_BBS(qualify **);

mbfido/addpkt.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: addpkt.c,v 1.17 2005/10/11 20:49:46 mbse Exp $
  * Purpose ...............: Add mail to .pkt
  *
  *****************************************************************************

mbfido/aliasdb.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: aliasdb.c,v 1.10 2008/11/26 22:12:28 mbse Exp $
  * Purpose ...............: Alias Database
  *
  *****************************************************************************

mbfido/announce.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: announce.c,v 1.37 2007/03/02 13:23:36 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************
@@ -118,7 +118,7 @@ void Uploads()
 			for (j = 0; j < 25; j++) {
 			    if (strlen(fdb.Desc[j])) {
 				snprintf(T_File.LDesc[k], 49, "%s", fdb.Desc[j]);
-				T_File.LDesc[k][49] = '\0';
+				T_File.LDesc[k][48] = '\0';
 				k++;
 			    }
 			}

mbfido/areamgr.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: areamgr.c,v 1.44 2005/10/11 20:49:46 mbse Exp $
  * Purpose ...............: AreaMgr
  *
  *****************************************************************************

mbfido/atoul.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: atoul.c,v 1.6 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/atoul.h

@@ -1,7 +1,7 @@
 #ifndef	_ATOUL_H
 #define	_ATOUL_H
 
-/* $Id$ */
+/* $Id: atoul.h,v 1.2 2005/10/11 20:49:47 mbse Exp $ */
 
 unsigned int atoul(char*);
 

mbfido/backalias.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: backalias.c,v 1.5 2004/02/21 17:22:01 mbroek Exp $
  * Purpose ...............: Alias functions.
  *
  *****************************************************************************

mbfido/bounce.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: bounce.c,v 1.11 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: Bounce Netmail
  *
  *****************************************************************************

mbfido/bwrite.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: bwrite.c,v 1.6 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/bwrite.h

@@ -1,7 +1,7 @@
 #ifndef	_BWRITE_H
 #define	_BWRITE_H
 
-/* $Id$ */
+/* $Id: bwrite.h,v 1.2 2005/10/11 20:49:47 mbse Exp $ */
 
 int iwrite(int, FILE *);
 int lwrite(int, FILE *);

mbfido/createf.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: createf.c,v 1.25 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: Create TIC Area and BBS file area.
  *
  *****************************************************************************

mbfido/createf.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: createf.h,v 1.2 2002/04/18 19:39:23 mbroek Exp $ */
 
 #ifndef	_CREATEH_H
 #define	_CREATEH_H

mbfido/createm.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: createm.c,v 1.32 2006/03/29 18:51:35 mbse Exp $
  * Purpose ...............: Create Message Area
  *
  *****************************************************************************

mbfido/createm.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: createm.h,v 1.4 2005/08/10 18:57:22 mbse Exp $ */
 
 #ifndef	_CREATEM_H
 #define	_CREATEM_H

mbfido/dirlock.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: dirlock.c,v 1.7 2005/08/28 15:33:23 mbse Exp $
  * Purpose ...............: Lock mbfido processing.
  *
  *****************************************************************************

mbfido/dirsession.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: dirsession.c,v 1.10 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: Directory Mail/Files sessions
  *
  *****************************************************************************

mbfido/dirsession.h

@@ -1,7 +1,7 @@
 #ifndef _DIRSESSION_H
 #define _DIRSESSION_H
 
-/* $Id$ */
+/* $Id: dirsession.h,v 1.4 2002/11/11 12:56:19 mbroek Exp $ */
 
 
 int  islocked(char *, int, int, int);	/* Is directory locked	    */

mbfido/fflist.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: fflist.c,v 1.8 2007/10/15 12:48:11 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************

mbfido/fflist.h

@@ -1,7 +1,7 @@
 #ifndef _FFLIST_H_
 #define _FFLIST_H
 
-/* $Id$ */
+/* $Id: fflist.h,v 1.3 2007/10/15 12:48:11 mbse Exp $ */
 
 typedef struct _ff_list {		/* Filefind array		   */
 	struct _ff_list	*next;

mbfido/filefind.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: filefind.c,v 1.26 2007/10/15 12:48:11 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************

mbfido/filemgr.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: filemgr.c,v 1.41 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: FileMgr
  *
  *****************************************************************************

mbfido/flock.c

@@ -1,13 +1,12 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose ...............: File locker
  *
  *****************************************************************************
- * Copyright (C) 1997-2004
+ * Copyright (C) 1997-2009
  *   
- * Michiel Broek		FIDO:		2:2801/16
- * Beekmansbos 10		Internet:	mbroek@ux123.pttnwb.nl
+ * Michiel Broek		FIDO:		2:280/2802
+ * Beekmansbos 10
  * 1971 BV IJmuiden
  * the Netherlands
  *
@@ -35,46 +34,44 @@
 
 int f_lock(char *fn)
 {
-	int lfd=-1;
-	struct flock fl;
-	struct stat st;
+    int		    lfd=-1;
+    struct flock    fl;
+    struct stat	    st;
 
-	if (fn) {
-		if ((lfd = open(fn,O_RDWR | O_CREAT)) < 0) {
-			perror("");
-			WriteError("Error opening file %s", fn);
-			return -1;
-		}
-
-		fl.l_type=F_WRLCK;
-		fl.l_whence=0;
-		fl.l_start=0L;
-		fl.l_len=0L;
-		fl.l_pid=getpid();
-
-		if (fcntl(lfd,F_SETLK,&fl) != 0) {
-			if (errno != EAGAIN)
-				Syslog('+', "Error locking file %s",fn);
-			close(lfd);
-			return -1;
-		}
-
-		if (stat(fn,&st) != 0) {
-			perror("");
-			WriteError("Error accessing file %s",fn);
-			close(lfd);
-			return -1;
-		}
+    if (fn) {
+	if ((lfd = open(fn, O_RDWR | O_CREAT, 0644)) < 0) {
+	    WriteError("$Error opening file %s", fn);
+	    return -1;
 	}
-	return lfd;
+
+	fl.l_type=F_WRLCK;
+	fl.l_whence=0;
+	fl.l_start=0L;
+	fl.l_len=0L;
+	fl.l_pid=getpid();
+
+	if (fcntl(lfd,F_SETLK,&fl) != 0) {
+	    if (errno != EAGAIN)
+		Syslog('+', "Error locking file %s",fn);
+	    close(lfd);
+	    return -1;
+	}
+
+	if (stat(fn,&st) != 0) {
+	    WriteError("$Error accessing file %s",fn);
+	    close(lfd);
+	    return -1;
+	}
+    }
+    return lfd;
 }
 
 
 
 void funlock(int fd)
 {
-	close(fd);
-	return;
+    close(fd);
+    return;
 }
 
 

mbfido/forward.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: forward.c,v 1.52 2006/03/27 18:48:27 mbse Exp $
  * Purpose ...............: File forward to a node
  *
  *****************************************************************************

mbfido/fsort.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: fsort.c,v 1.7 2005/08/28 15:33:23 mbse Exp $
  * Purpose ...............: File sort
  *
  *****************************************************************************

mbfido/ftn2rfc.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: ftn2rfc.c,v 1.34 2007/08/26 12:21:16 mbse Exp $
  * Purpose ...............: Gate netmail->email or echomail->news
  *
  *****************************************************************************

mbfido/grlist.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: grlist.c,v 1.6 2005/08/28 14:52:14 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************

mbfido/hash.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: hash.c,v 1.7 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/hash.h

@@ -1,7 +1,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-/* $Id$ */
+/* $Id: hash.h,v 1.2 2005/10/11 20:49:47 mbse Exp $ */
 
 void hash_update_s(unsigned int *, char *);
 void hash_update_n(unsigned int *, unsigned int);

mbfido/hatch.c

@@ -1,10 +1,9 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose ...............: Hatch files
  *
  *****************************************************************************
- * Copyright (C) 1997-2005
+ * Copyright (C) 1997-2009
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -51,8 +50,7 @@ void Hatch()
     FILE	*fp;
     struct tm	*Tm;
     time_t	Now;
-    int		LastDay;
-    int		HatchToday;
+    int		LastDay, HatchToday;
 
     temp = calloc(PATH_MAX, sizeof(char));
     Syslog('+', "Pass: hatch files");
@@ -76,7 +74,7 @@ void Hatch()
 	return;
     }
 
-    fread(&hatchhdr, sizeof(hatchhdr), 1, fp);
+    (void)fread(&hatchhdr, sizeof(hatchhdr), 1, fp);
 
     while (fread(&hatch, hatchhdr.recsize, 1, fp) == 1) {
 	if (hatch.Active) {

mbfido/lhash.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: lhash.c,v 1.8 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/magic.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: magic.c,v 1.27 2005/11/12 12:52:30 mbse Exp $
  * Purpose ...............: .TIC files magic processing. 
  *
  *****************************************************************************

mbfido/makestat.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: makestat.c,v 1.31 2007/02/25 20:28:07 mbse Exp $
  * Purpose ...............: Make Web statistics
  *
  *****************************************************************************

mbfido/maketags.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: maketags.c,v 1.8 2005/08/28 14:52:15 mbse Exp $
  * Purpose ...............: Make tag files
  *
  *****************************************************************************

mbfido/mbaff.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbaff.c,v 1.22 2007/09/02 11:17:32 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************

mbfido/mbdiff.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbdiff.c,v 1.32 2008/11/26 22:12:28 mbse Exp $
  * Purpose ...............: Nodelist diff processor
  * Original ideas ........: Eugene G. Crosser.
  * 

mbfido/mbfadopt.c

@@ -1,10 +1,9 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose: File Database Maintenance - Adopt file
  *
  *****************************************************************************
- * Copyright (C) 1997-2008
+ * Copyright (C) 1997-2011
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -47,7 +46,7 @@ void AdoptFile(int Area, char *File, char *Description)
     FILE		*fp;
     char		*temp, *temp2, *tmpdir, *unarc, *pwd, *lname, *fileid;
     char		Desc[256], TDesc[256];
-    int			IsArchive = FALSE, MustRearc = FALSE, UnPacked = FALSE;
+    int			MustRearc = FALSE, UnPacked = FALSE;
     int			IsVirus = FALSE, File_Id = FALSE;
     int			i, j, k, lines = 0, File_id_cnt = 0;
     struct FILE_record	f_db;
@@ -100,7 +99,6 @@ void AdoptFile(int Area, char *File, char *Description)
 	}
 
 	if ((unarc = unpacker(File))) {
-	    IsArchive = TRUE;
 	    if (strlen(area.Archiver) && (strcmp(unarc, area.Archiver) == 0))
 		MustRearc = TRUE;
 	    UnPacked = UnpackFile(temp);

mbfido/mbfadopt.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfadopt.h,v 1.1 2001/11/18 23:19:08 mbroek Exp $ */
 
 #ifndef _MBFADOPT_H_
 #define _MBFADOPT_H

mbfido/mbfcheck.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfcheck.c,v 1.39 2007/03/07 20:05:30 mbse Exp $
  * Purpose: File Database Maintenance - Check filebase
  *
  *****************************************************************************

mbfido/mbfcheck.h

@@ -1,7 +1,7 @@
 #ifndef _MBFCHECK_H
 #define _MBFCHECK_H
 
-/* $Id$ */
+/* $Id: mbfcheck.h,v 1.3 2005/10/11 20:49:47 mbse Exp $ */
 
 void	Check(int);			/* Check file database		*/
 

mbfido/mbfdel.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfdel.c,v 1.17 2005/08/11 21:05:15 mbse Exp $
  * Purpose: File Database Maintenance - Delete/Undelete a file
  *
  *****************************************************************************

mbfido/mbfdel.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfdel.h,v 1.1 2001/12/02 22:36:23 mbroek Exp $ */
 
 #ifndef _MBFDELE_H
 #define _MBFDELE_H

mbfido/mbfido.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfido.c,v 1.50 2007/09/02 11:17:32 mbse Exp $
  * Purpose: Process Fidonet style mail and files.
  *
  *****************************************************************************
@@ -589,7 +589,8 @@ int main(int argc, char **argv)
 	}
 	temp = calloc(10240, sizeof(char));
 	while (fgets(temp, 10240, stdin))
-	    fprintf(ofp, temp);
+	    (void)fputs(temp, ofp);
+	//    fprintf(ofp, temp);
 	free(temp);
 
 	for (envrecip = &envrecip_start; *envrecip; envrecip = &((*envrecip)->next)) {
@@ -739,7 +740,7 @@ int TossMail(void)
      * First toss any netmail packets.
      */
     maxrc = rc = TossPkts();
-    chdir(inbound);
+    (void)chdir(inbound);
 
     /*
      * Scan the directory for ARCmail archives. The archive extension
@@ -790,7 +791,7 @@ int TossMail(void)
 	    if ((rc = unpack(fname)) == 0) {
 		files_ok++;
 		rc = TossPkts();
-		chdir(inbound);
+		(void)chdir(inbound);
 	    } else 
 		WriteError("Error unpacking file %s", fname);
 	else

mbfido/mbfido.h

@@ -1,7 +1,7 @@
 #ifndef _MBFIDO_H
 #define _MBFIDO_H
 
-/* $Id$ */
+/* $Id: mbfido.h,v 1.2 2005/08/10 18:57:22 mbse Exp $ */
 
 void	Help(void);
 void	ProgName(void);

mbfido/mbfile.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfile.c,v 1.38 2007/09/02 11:17:32 mbse Exp $
  * Purpose: File Database Maintenance
  *
  *****************************************************************************

mbfido/mbfile.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfile.h,v 1.3 2001/11/18 23:19:08 mbroek Exp $ */
 
 #ifndef _MBFILE_H_
 #define _MBFILE_H

mbfido/mbfimport.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfimport.c,v 1.39 2008/02/17 17:50:14 mbse Exp $
  * Purpose: File Database Maintenance - Import files with files.bbs
  *
  *****************************************************************************
@@ -316,7 +316,7 @@ void ImportFiles(int Area)
 					line++;
 					pos = 0;
 				    } else {
-					if (pos == 49) {
+					if (pos == 48) {
 					    f_db.Desc[line][pos] = '\0';
 					    pos = 0;
 					    line++;
@@ -371,7 +371,7 @@ void ImportFiles(int Area)
 				    line++;
 				    pos = 0;
 				} else {
-				    if (pos == 49) {
+				    if (pos == 48) {
 					f_db.Desc[line][pos] = '\0';
 					pos = 0;
 					line++;

mbfido/mbfimport.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfimport.h,v 1.1 2001/11/25 12:25:59 mbroek Exp $ */
 
 #ifndef _MBFIMPORT_H
 #define	_MBFIMPORT_H

mbfido/mbfindex.c

@@ -1,10 +1,9 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose: File Database Maintenance - Build index for request processor
  *
  *****************************************************************************
- * Copyright (C) 1997-2007
+ * Copyright (C) 1997-2011
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -64,22 +63,6 @@ static char *months[]= {(char *)"Jan",(char *)"Feb",(char *)"Mar",
 
 
 
-/*
- * Translate a string from ANSI to safe HTML characters
- */
-/*
-char *To_Html(char *);
-char *To_Html(char *inp)
-{
-    static char	temp[1024];
-
-    memset(&temp, 0, sizeof(temp));
-    strncpy(temp, chartran(inp), sizeof(temp) -1);
-
-    return temp;
-}
-*/
-
 
 void tidy_index(Findex **);
 void tidy_index(Findex **fap)
@@ -248,25 +231,28 @@ void pagelink(FILE *fa, char *Path, int inArea, int Current)
 FILE *newpage(char *, char *, time_t, int, int, FILE *);
 FILE *newpage(char *Path, char *Name, time_t later, int inArea, int Current, FILE *fi)
 {
-        char            linebuf[1024], outbuf[1024];
-        static FILE*    fa;
+    char            linebuf[1024], outbuf[1024];
+    static FILE*    fa;
 
-        lastfile = Current;
-        if (Current)
-                snprintf(linebuf, 1024, "%s/index%d.temp", Path, Current / CFG.www_files_page);
-        else
-                snprintf(linebuf, 1024, "%s/index.temp", Path);
-        if ((fa = fopen(linebuf, "w")) == NULL) {
-                WriteError("$Can't create %s", linebuf);
-        } else {
-                snprintf(linebuf, 1024, "%s", Name);
-                html_massage(linebuf, outbuf, 1024);
-		MacroVars("ab", "ss", rfcdate(later), outbuf);
-                pagelink(fa, Path, inArea, Current);
-		MacroRead(fi, fa);
-                return fa;
-        }
-        return NULL;
+    lastfile = Current;
+    if (Current)
+	snprintf(linebuf, 1024, "%s/index%d.temp", Path, Current / CFG.www_files_page);
+    else
+	snprintf(linebuf, 1024, "%s/index.temp", Path);
+    if ((fa = fopen(linebuf, "w")) == NULL) {
+	WriteError("$Can't create %s", linebuf);
+    } else {
+	if (Current)
+	    snprintf(linebuf, 1024, "%s page %d", Name, (Current / CFG.www_files_page) + 1);
+	else
+	    snprintf(linebuf, 1024, "%s", Name);
+	html_massage(linebuf, outbuf, 1024);
+	MacroVars("ab", "ss", rfcdate(later), outbuf);
+	pagelink(fa, Path, inArea, Current);
+	MacroRead(fi, fa);
+	return fa;
+    }
+    return NULL;
 }
 
 

mbfido/mbfindex.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfindex.h,v 1.1 2001/11/18 23:19:08 mbroek Exp $ */
 
 #ifndef _MBFINDEX_H_
 #define _MBFINDEX_H

mbfido/mbfkill.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfkill.c,v 1.27 2005/08/28 14:10:06 mbse Exp $
  * Purpose: File Database Maintenance, kill or move old files
  *
  *****************************************************************************

mbfido/mbfkill.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfkill.h,v 1.1 2001/11/18 23:19:08 mbroek Exp $ */
 
 #ifndef _MBFKILL_H
 #define	_MBFKILL_H

mbfido/mbflist.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbflist.c,v 1.21 2005/10/11 20:49:47 mbse Exp $
  * Purpose: File Database Maintenance - List areas and totals
  *
  *****************************************************************************

mbfido/mbflist.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbflist.h,v 1.2 2001/11/25 14:13:55 mbroek Exp $ */
 
 #ifndef _MBFLIST_H_
 #define _MBFLIST_H

mbfido/mbfmove.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfmove.c,v 1.19 2005/08/11 21:05:15 mbse Exp $
  * Purpose: File Database Maintenance - Move a file
  *
  *****************************************************************************

mbfido/mbfmove.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfmove.h,v 1.1 2001/12/02 19:17:14 mbroek Exp $ */
 
 #ifndef _MBFMOVE_H
 #define _MBFMOVE_H

mbfido/mbfpack.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfpack.c,v 1.26 2005/12/16 20:12:17 mbse Exp $
  * Purpose: File Database Maintenance - Pack filebase
  *
  *****************************************************************************

mbfido/mbfpack.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfpack.h,v 1.2 2003/11/08 15:30:04 mbroek Exp $ */
 
 #ifndef _MBFPACK_H
 #define _MBFPACK_H

mbfido/mbfrearc.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfrearc.c,v 1.11 2005/10/11 20:49:47 mbse Exp $
  * Purpose: File Database Maintenance - ReArc file(s)
  *
  *****************************************************************************

mbfido/mbfrearc.h

@@ -1,7 +1,7 @@
 #ifndef _MBFREARC_H
 #define _MBFREARC_H
 
-/* $Id$ */
+/* $Id: mbfrearc.h,v 1.1 2004/03/08 20:51:05 mbroek Exp $ */
 
 void ReArc(int, char *);
 

mbfido/mbfsort.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfsort.c,v 1.11 2005/08/28 14:10:06 mbse Exp $
  * Purpose: File Database Maintenance - Sort filebase
  *
  *****************************************************************************

mbfido/mbfsort.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfsort.h,v 1.1 2003/11/08 15:30:04 mbroek Exp $ */
 
 #ifndef _MBFSORT_H
 #define _MBFSORT_H

mbfido/mbftoberep.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbftoberep.c,v 1.12 2005/10/11 20:49:47 mbse Exp $
  * Purpose: File Database Maintenance - Show toberep database
  *
  *****************************************************************************

mbfido/mbftoberep.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbftoberep.h,v 1.1 2001/11/25 16:38:06 mbroek Exp $ */
 
 #ifndef _MBFTOBEREP_H
 #define _MBFTOBEREP_H

mbfido/mbfutil.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbfutil.c,v 1.53 2008/11/26 22:12:28 mbse Exp $
  * Purpose: File Database Maintenance - utilities
  *
  *****************************************************************************

mbfido/mbfutil.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mbfutil.h,v 1.7 2005/12/03 14:52:35 mbse Exp $ */
 
 #ifndef _MBFUTIL_H_
 #define _MBFUTIL_H

mbfido/mbindex.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbindex.c,v 1.34 2007/09/02 11:17:32 mbse Exp $
  * Purpose ...............: Nodelist Compiler
  *
  *****************************************************************************

mbfido/mbindex.h

@@ -1,7 +1,7 @@
 #ifndef	_MBINDEX_H
 #define	_MBINDEX_H
 
-/* $Id$ */
+/* $Id: mbindex.h,v 1.4 2004/07/10 15:03:49 mbse Exp $ */
 
 typedef	struct	_fd_list {
     struct _fd_list	*next;

mbfido/mbmsg.c

@@ -1,10 +1,9 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose ...............: Message Base Maintenance
  *
  *****************************************************************************
- * Copyright (C) 1997-2007
+ * Copyright (C) 1997-2011
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -423,7 +422,7 @@ void LinkArea(char *Path, int Areanr)
  */
 void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs, int Areanr)
 {
-    unsigned int    Number, TotalMsgs = 0, Highest, *Active, Counter = 0;
+    unsigned int    Number, TotalMsgs = 0, *Active, Counter = 0;
     int		    i, DelCount = 0, DelAge = 0, Done;
     time_t	    Today, MsgDate;
 
@@ -455,7 +454,6 @@ void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs, int Areanr)
 		Active = NULL;
 
 	    Number  = Msg_Lowest();
-	    Highest = Msg_Highest();
 
 	    do {
 		if (CFG.slow_util && do_quiet)

mbfido/mbmsg.h

@@ -1,7 +1,7 @@
 #ifndef	_MBMSG_H
 #define	_MBMSG_H
 
-/* $Id$ */
+/* $Id: mbmsg.h,v 1.4 2005/10/11 20:49:47 mbse Exp $ */
 
 void	ProgName(void);
 void	Help(void);

mbfido/mbseq.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mbseq.c,v 1.9 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: give a hexadecimal sequence to stdout
  *
  *****************************************************************************

mbfido/mgrutil.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mgrutil.c,v 1.42 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: AreaMgr and FileMgr utilities.
  *
  *****************************************************************************

mbfido/mgrutil.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mgrutil.h,v 1.10 2005/08/28 12:54:10 mbse Exp $ */
 
 #ifndef	_MGRUTIL_H
 #define	_MGRUTIL_H

mbfido/mkftnhdr.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mkftnhdr.c,v 1.19 2008/11/26 22:28:31 mbse Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/mover.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: mover.c,v 1.15 2005/11/19 19:43:03 mbse Exp $
  * Purpose ...............: Bad file mover
  *
  *****************************************************************************

mbfido/mover.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mover.h,v 1.2 2001/12/09 15:20:51 mbroek Exp $ */
 
 #ifndef	_MOVER_H
 #define	_MOVER_H

mbfido/msg.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: msg.c,v 1.16 2008/11/26 22:12:28 mbse Exp $
  * Purpose ...............: Read *.msg messages
  *
  *****************************************************************************

mbfido/msg.h

@@ -1,7 +1,7 @@
 #ifndef	_FTNMSG_H
 #define	_FTNMSG_H
 
-/* $Id$ */
+/* $Id: msg.h,v 1.2 2004/07/23 21:24:09 mbse Exp $ */
 
 int toss_msgs(void);
 

mbfido/msgflags.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: msgflags.c,v 1.4 2004/02/21 17:22:02 mbroek Exp $
  * Purpose ...............: MBSE BBS Mail Gate
  *
  *****************************************************************************

mbfido/msgflags.h

@@ -1,7 +1,7 @@
 #ifndef _MSGFLAGS_H
 #define	_MSGFLAGS_H
 
-/* $Id$ */
+/* $Id: msgflags.h,v 1.1 2002/06/30 12:48:46 mbroek Exp $ */
 
 int     flag_on(char *,char *);
 int     flagset(char *);

mbfido/msgutil.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: msgutil.c,v 1.31 2007/03/05 12:25:20 mbse Exp $
  * Purpose ...............: Announce new files and FileFind
  *
  *****************************************************************************

mbfido/msgutil.h

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msgutil.h,v 1.5 2007/03/05 12:25:20 mbse Exp $ */
 
 #ifndef	_MSGUTIL_H
 #define	_MSGUTIL_H

mbfido/newspost.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: newspost.c,v 1.14 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: Post newsarticles in temp newsfile.
  *
  *****************************************************************************

mbfido/notify.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: notify.c,v 1.13 2005/08/28 14:10:06 mbse Exp $
  * Purpose ...............: Write notify messages.
  *
  *****************************************************************************

mbfido/orphans.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: orphans.c,v 1.4 2008/03/14 20:10:08 mbse Exp $
  * Purpose ...............: List of orphaned ticfiles
  *
  *****************************************************************************

mbfido/orphans.h

@@ -1,7 +1,7 @@
 #ifndef	_ORPHANS_H
 #define	_ORPHANS_H
 
-/* $Id$ */
+/* $Id: orphans.h,v 1.1 2005/11/12 12:33:06 mbse Exp $ */
 
 /*
  * Linked list of orpaned ticfiles.

mbfido/ping.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: ping.c,v 1.14 2005/10/11 20:49:47 mbse Exp $
  * Purpose ...............: Ping Service
  *
  *****************************************************************************

mbfido/post.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: post.c,v 1.26 2006/02/21 20:39:52 mbse Exp $
  * Purpose ...............: Post a message from a file.
  *
  *****************************************************************************

mbfido/post.h

@@ -1,7 +1,7 @@
 #ifndef _POST_H
 #define _POST_H
 
-/* $Id$ */
+/* $Id: post.h,v 1.3 2005/10/11 20:49:47 mbse Exp $ */
 
 int Post(char *, int, char *, char *, char *);	/* Post a Message */
 

mbfido/postecho.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: postecho.c,v 1.35 2008/03/12 19:16:10 mbse Exp $
  * Purpose ...............: Post echomail message.
  *
  *****************************************************************************

mbfido/postecho.h

@@ -1,7 +1,7 @@
 #ifndef _POSTECHO_H
 #define _POSTECHO_H
 
-/* $Id$ */
+/* $Id: postecho.h,v 1.3 2004/08/12 12:50:53 mbse Exp $ */
 
 
 int	postecho(faddr *, faddr *, faddr *, char *, char *, time_t, int, int, FILE *, int, int);

mbfido/postemail.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: postemail.c,v 1.11 2005/08/28 12:28:24 mbse Exp $
  * Purpose ...............: Post Email message from temp file
  *
  *****************************************************************************

mbfido/postnetmail.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: postnetmail.c,v 1.21 2005/08/28 14:10:06 mbse Exp $
  * Purpose ...............: Post Netmail message from temp file
  *
  *****************************************************************************

mbfido/postnetmail.h

@@ -1,7 +1,7 @@
 #ifndef _POSTNETMAIL_H
 #define _POSTNETMAIL_H
 
-/* $Id$ */
+/* $Id: postnetmail.h,v 1.2 2002/12/22 14:41:34 mbroek Exp $ */
 
 int	postnetmail(FILE *, faddr *, faddr *, char *, char *, time_t, int, int, unsigned int, unsigned int);
 

mbfido/ptic.c

@@ -1,10 +1,9 @@
 /*****************************************************************************
  *
- * $Id$
  * Purpose ...............: Process 1 .tic file
  *
  *****************************************************************************
- * Copyright (C) 1997-2008
+ * Copyright (C) 1997-2011
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -67,9 +66,8 @@ extern	int	check_dupe;
  */
 int ProcessTic(fa_list **sbl, orphans **opl)
 {
-    time_t	    Now;
     int		    First, Listed = FALSE, DownLinks = 0, MustRearc = FALSE;
-    int		    UnPacked = FALSE, IsArchive = FALSE, rc, i, j, k, File_Id = FALSE;
+    int		    UnPacked = FALSE, IsArchive = FALSE, rc, i, j, k;
     char	    *Temp, *unarc = NULL, *cmd = NULL;
     char	    temp1[PATH_MAX], temp2[PATH_MAX], sbe[24], TDesc[1024];
     unsigned int    crc, crc2, Kb;
@@ -81,8 +79,6 @@ int ProcessTic(fa_list **sbl, orphans **opl)
     qualify	    *qal = NULL, *tmpq;
     orphans	    *topl;
 
-    Now = time(NULL);
-
     if (TIC.TicIn.PathError) {
 	WriteError("Our Aka is in the path");
 	tic_bad++;
@@ -454,9 +450,6 @@ int ProcessTic(fa_list **sbl, orphans **opl)
 		Syslog('f', "Found %s", Temp);
 		snprintf(temp1, PATH_MAX, "%s/tmp/arc%d/%s", getenv("MBSE_ROOT"), (int)getpid(), Temp);
 		snprintf(temp2, PATH_MAX, "%s/tmp/FILE_ID.DIZ", getenv("MBSE_ROOT"));
-		if (file_cp(temp1, temp2) == 0) {
-		    File_Id = TRUE;
-		}
 	    } else {
 		Syslog('f', "Didn't find a FILE_ID.DIZ");
 	    }
@@ -472,13 +465,9 @@ int ProcessTic(fa_list **sbl, orphans **opl)
 		    snprintf(temp1, PATH_MAX, "%s/tmp", getenv("MBSE_ROOT"));
 		    chdir(temp1);
 		    snprintf(temp1, PATH_MAX, "%s/%s FILE_ID.DIZ", TIC.Inbound, TIC.TicIn.File);
-		    if (execute_str(cmd, temp1, (char *)NULL, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null") == 0) {
-			File_Id = TRUE;
-		    } else {
+		    if (execute_str(cmd, temp1, (char *)NULL, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null")) {
 			snprintf(temp1, PATH_MAX, "%s/%s file_id.diz", TIC.Inbound, TIC.TicIn.File);
-			if (execute_str(cmd, temp1, (char *)NULL, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null") == 0) {
-			    File_Id = TRUE;
-			}
+			execute_str(cmd, temp1, (char *)NULL, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
 		    }
 		    free(cmd);
 		}
@@ -664,7 +653,7 @@ int ProcessTic(fa_list **sbl, orphans **opl)
 	 * Add all our system aka's to the seenby lines in the same zone,
 	 * omit aka's already in the seenby list.
 	 */
-	for (i = 0; i < 40; i++) {
+	for (i = 0; i < 39; i++) {
 	    if (CFG.akavalid[i] && (tic.Aka.zone == CFG.aka[i].zone)) {
 		p_from = fido2faddr(CFG.aka[i]);
 		if (! in_list(p_from, sbl, TRUE)) {

mbfido/ptic.h

@@ -1,7 +1,7 @@
 #ifndef	_PTIC_H
 #define	_PTIC_H
 
-/* $Id$ */
+/* $Id: ptic.h,v 1.4 2005/11/12 12:52:30 mbse Exp $ */
 
 int ProcessTic(fa_list **, orphans **);
 

mbfido/qualify.c

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * $Id: qualify.c,v 1.4 2004/02/21 17:22:02 mbroek Exp $
  * Purpose ...............: List of qualified systems
  *
  *****************************************************************************

mbfido/qualify.h

@@ -1,7 +1,7 @@
 #ifndef _QUALIFY_H
 #define _QUALIFY_H
 
-/* $Id$ */
+/* $Id: qualify.h,v 1.1 2002/11/20 18:41:15 mbroek Exp $ */
 
 /*
  *  Structure for qualified systems to receive a echomail message/tic file