From fda22114972f0787da48c095a027c459c8deb9f9 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Fri, 6 Jan 2006 20:22:37 +0000
Subject: [PATCH] Added switches to default extract commands for file_id.diz to
 force upper/lower case

---
 ChangeLog           |  9 +++++++++
 TODO                |  2 --
 mbsetup/m_archive.c | 12 ++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f334942..4a36d870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@ v0.83.7		31-Dec-2005
 	mbfile:
 		Made searching file file_id.diz case insensitive.
 
+	mbsetup:
+		Added switches to default extract commands for file_id.diz 
+		files to:
+		  nomarch -U
+		  rar -cu
+		  unrar -cu
+		  unzip -L
+		Other archives don't support forced upper or lowercase.
+		  
 
 v0.83.6		17-Dec-2005 - 31-Dec-2005
 
diff --git a/TODO b/TODO
index 85b3f812..0a93b632 100644
--- a/TODO
+++ b/TODO
@@ -91,8 +91,6 @@ mbfido:
 
 	W: Someday make retoss from bad possible (volonteers?).
 
-	N: Case insensitive search for file_Id.DiZ
-
 mbcico:
 	N: Implement binkp option NR.
 
diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c
index 17bd5af2..d6389f0b 100644
--- a/mbsetup/m_archive.c
+++ b/mbsetup/m_archive.c
@@ -4,7 +4,7 @@
  * Purpose ...............: Setup Archive structure.
  *
  *****************************************************************************
- * Copyright (C) 1997-2005
+ * Copyright (C) 1997-2006
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -94,7 +94,7 @@ int CountArchive(void)
 	    if (strlen(_PATH_NOMARCH)) {
 		snprintf(archiver.funarc, 65,  "%s -U", _PATH_NOMARCH);
 		snprintf(archiver.munarc, 65,  "%s", _PATH_NOMARCH);
-		snprintf(archiver.iunarc, 65,  "%s", _PATH_NOMARCH);
+		snprintf(archiver.iunarc, 65,  "%s -U", _PATH_NOMARCH);
 		snprintf(archiver.varc, 65,    "%s -l", _PATH_NOMARCH);
 	    }
 	    fwrite(&archiver, sizeof(archiver), 1, fil);
@@ -133,12 +133,12 @@ int CountArchive(void)
 		snprintf(archiver.varc, 65,    "%s l", _PATH_RAR);
 		snprintf(archiver.funarc, 65,  "%s x -o+ -y -r", _PATH_RAR);
 		snprintf(archiver.munarc, 65,  "%s e -o+ -y", _PATH_RAR);
-		snprintf(archiver.iunarc, 65,  "%s e", _PATH_RAR);
+		snprintf(archiver.iunarc, 65,  "%s e -cu", _PATH_RAR);
 	    } else if (strlen(_PATH_UNRAR)) {
 		archiver.available = TRUE;
 		snprintf(archiver.funarc, 65,  "%s x -o+ -y -r", _PATH_UNRAR);
 		snprintf(archiver.munarc, 65,  "%s e -o+ -y", _PATH_UNRAR);
-		snprintf(archiver.iunarc, 65,  "%s e", _PATH_UNRAR);
+		snprintf(archiver.iunarc, 65,  "%s e -cu", _PATH_UNRAR);
 		snprintf(archiver.varc, 65,    "%s l", _PATH_UNRAR);
 	    } else {
 		archiver.available = FALSE;
@@ -149,7 +149,7 @@ int CountArchive(void)
 		snprintf(archiver.varc, 65,    "/usr/bin/rar l");
 		snprintf(archiver.funarc, 65,  "/usr/bin/unrar x -o+ -y -r");
 		snprintf(archiver.munarc, 65,  "/usr/bin/unrar e -o+ -y");
-		snprintf(archiver.iunarc, 65,  "/usr/bin/unrar e");
+		snprintf(archiver.iunarc, 65,  "/usr/bin/unrar e -cu");
 	    }
             fwrite(&archiver, sizeof(archiver), 1, fil);
 
@@ -313,7 +313,7 @@ int CountArchive(void)
 	    } else {
 		snprintf(archiver.funarc, 65,  "/usr/bin/unzip -o -q");
 		snprintf(archiver.munarc, 65,  "/usr/bin/unzip -o -j -L");
-		snprintf(archiver.iunarc, 65,  "/usr/bin/unzip -o -j");
+		snprintf(archiver.iunarc, 65,  "/usr/bin/unzip -o -j -L");
 		snprintf(archiver.varc, 65,    "/usr/bin/unzip -l");
 	    }
             fwrite(&archiver, sizeof(archiver), 1, fil);