From 5a08bf30dff55936680ea1f088b0f1f29c9b0bac Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Thu, 27 Jun 2002 19:07:14 +0000
Subject: [PATCH] Fixed unix default archivers

---
 ChangeLog           |  4 ++++
 mbsetup/m_archive.c | 48 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 041bdee7..c38d89b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@ v0.35.02	22-Jun-2002
 		Implemented nodes special outbound box setup. When you enter
 		that item for the first time, it fills this with a suggested
 		path.
+		Changed description and filetype for default tar gzipped files
+		in archiver setup.
+		Added default records for bzip2 and uncompressed tar files.
 
 	mbcico:
 		Implemented nodes special outbound boxes.
@@ -37,6 +40,7 @@ v0.35.02	22-Jun-2002
 		and time. Possible cause: SunMail 1.0
 		When reading taglists if there was no description after the
 		tag, mbfido would crash.
+		Filefind netmail replies now set the private flag.
 
 	mbindex:
 		Fixed a crash when a pointlist contained Point,5,reservered,
diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c
index a05bfc3b..2588d7cb 100644
--- a/mbsetup/m_archive.c
+++ b/mbsetup/m_archive.c
@@ -139,8 +139,8 @@ int CountArchive(void)
                         fwrite(&archiver, sizeof(archiver), 1, fil);
 
                         memset(&archiver, 0, sizeof(archiver));
-                        sprintf(archiver.comment, "TAR the GNU version");
-                        sprintf(archiver.name,    "TAR");
+                        sprintf(archiver.comment, "TAR gzip files");
+                        sprintf(archiver.name,    "GZIP");
 			if (strlen(_PATH_TAR)) {
 			    archiver.available = TRUE;
 			    sprintf(archiver.farc,    "%s cfz", _PATH_TAR);
@@ -160,6 +160,50 @@ int CountArchive(void)
 			}
                         fwrite(&archiver, sizeof(archiver), 1, fil);
 
+			memset(&archiver, 0, sizeof(archiver));
+			sprintf(archiver.comment, "TAR bzip2 files");
+			sprintf(archiver.name,    "BZIP");
+			if (strlen(_PATH_TAR)) {
+			    archiver.available = TRUE;
+			    sprintf(archiver.farc,    "%s cfj", _PATH_TAR);
+			    sprintf(archiver.marc,    "%s Afj", _PATH_TAR);
+			    sprintf(archiver.tarc,    "%s tfj", _PATH_TAR);
+			    sprintf(archiver.funarc,  "%s xfj", _PATH_TAR);
+			    sprintf(archiver.munarc,  "%s xfj", _PATH_TAR);
+			    sprintf(archiver.iunarc,  "%s xfj", _PATH_TAR);
+			} else {
+			    archiver.available = FALSE;
+			    sprintf(archiver.farc,    "/bin/tar cfj");
+			    sprintf(archiver.marc,    "/bin/tar Afj");
+			    sprintf(archiver.tarc,    "/bin/tar tfj");
+			    sprintf(archiver.funarc,  "/bin/tar xfj");
+			    sprintf(archiver.munarc,  "/bin/tar xfj");
+			    sprintf(archiver.iunarc,  "/bin/tar xfj");
+			}
+			fwrite(&archiver, sizeof(archiver), 1, fil);
+
+			memset(&archiver, 0, sizeof(archiver));
+			sprintf(archiver.comment, "TAR files");
+			sprintf(archiver.name,    "TAR");
+			if (strlen(_PATH_TAR)) {
+			    archiver.available = TRUE;
+			    sprintf(archiver.farc,    "%s cf", _PATH_TAR);
+			    sprintf(archiver.marc,    "%s Af", _PATH_TAR);
+			    sprintf(archiver.tarc,    "%s tf", _PATH_TAR);
+			    sprintf(archiver.funarc,  "%s xf", _PATH_TAR);
+			    sprintf(archiver.munarc,  "%s xf", _PATH_TAR);
+			    sprintf(archiver.iunarc,  "%s xf", _PATH_TAR);
+			} else {
+			    archiver.available = FALSE;
+			    sprintf(archiver.farc,    "/bin/tar cf");
+			    sprintf(archiver.marc,    "/bin/tar Af");
+			    sprintf(archiver.tarc,    "/bin/tar tf");
+			    sprintf(archiver.funarc,  "/bin/tar xf");
+			    sprintf(archiver.munarc,  "/bin/tar xf");
+			    sprintf(archiver.iunarc,  "/bin/tar xf");
+			}
+			fwrite(&archiver, sizeof(archiver), 1, fil);
+
                         memset(&archiver, 0, sizeof(archiver));
                         sprintf(archiver.comment, "UNARJ by Robert K Jung");
                         sprintf(archiver.name,    "ARJ");