From 88763361255b56fa3c01a379a0a6c03c90dc3698 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Thu, 18 Apr 2002 20:32:57 +0000
Subject: [PATCH] magic filename testing improved

---
 ChangeLog      |   1 +
 mbfido/magic.c | 121 ++++++++++++++++++++++++-------------------------
 2 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35e73926..60c1d9e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4717,6 +4717,7 @@ v0.33.20        10-Feb-2002
 		that has a header line starting with X-MS-, the headerline is
 		supressed because there is no key for this header. This looks
 		like a new kind of M$ standard. mbnews crashed on this one.
+		Fixed a small problem in magic filename testing.
 
 	mbfile:
 		The mbfile index command now creates the html pages using the
diff --git a/mbfido/magic.c b/mbfido/magic.c
index 56fc1f6f..7cf8636a 100644
--- a/mbfido/magic.c
+++ b/mbfido/magic.c
@@ -100,82 +100,77 @@ char *Magic_Macro(int C)
 
 int GetMagicRec(int Typ, int First)
 {
-	int	Eof = FALSE, DoMagic = TRUE;
-	int	i;
-	char	*temp;
-	FILE	*FeM;
+    int	    Eof = FALSE, DoMagic = TRUE;
+    int	    i;
+    char    *temp;
+    FILE    *FeM;
 
-	if (First)
-		MagicNr = 0;
+    if (First)
+	MagicNr = 0;
 
-	temp = calloc(PATH_MAX, sizeof(char));
-	sprintf(temp, "%s/etc/magic.data", getenv("MBSE_ROOT"));
-	if ((FeM = fopen(temp, "r")) == NULL) {
-		Syslog('+', "Huh? No magic file? (%s)", temp);
-		free(temp);
-		return FALSE;
+    temp = calloc(PATH_MAX, sizeof(char));
+    sprintf(temp, "%s/etc/magic.data", getenv("MBSE_ROOT"));
+    if ((FeM = fopen(temp, "r")) == NULL) {
+	Syslog('+', "Huh? No magic file? (%s)", temp);
+	free(temp);
+	return FALSE;
+    }
+
+    fread(&magichdr, sizeof(magichdr), 1, FeM);
+
+    do {
+	if (fseek(FeM, magichdr.hdrsize + (MagicNr * magichdr.recsize), SEEK_SET) != 0) {
+	    WriteError("$Can't seek record %ld in %s", MagicNr, temp);
+	    free(temp);
+	    fclose(FeM);
+	    return FALSE;
 	}
 
-	fread(&magichdr, sizeof(magichdr), 1, FeM);
+	MagicNr++;
 
-	do {
-		if (fseek(FeM, magichdr.hdrsize + (MagicNr * magichdr.recsize), SEEK_SET) != 0) {
-			WriteError("$Can't seek record %ld in %s", MagicNr, temp);
-			free(temp);
-			fclose(FeM);
-			return FALSE;
-		}
+	if (fread(&magic, magichdr.recsize, 1, FeM) == 1) {
 
-		MagicNr++;
+	    if ((magic.Active) && (magic.Attrib == Typ) && (strcasecmp(magic.From, TIC.TicIn.Area) == 0)) {
 
-		if (fread(&magic, magichdr.recsize, 1, FeM) == 1) {
+		/*
+		 * Comparing of the filename must be done in 
+		 * two parts, before and after the dot.
+		 */
+		if (strlen(magic.Mask) == strlen(TIC.NewName)) {
+		    for (i = 0; i < strlen(magic.Mask); i++) {
+			switch (magic.Mask[i]) {
+			    case '?':	break;
+			    case '@':	if (!isalpha(TIC.NewName[i]))
+					    DoMagic = FALSE;
+					break;
+			    case '#':	if (!isdigit(TIC.NewName[i]))
+					    DoMagic = FALSE;
+					break;
 
-			if ((magic.Active) && (magic.Attrib == Typ) &&
-			    (strcmp(magic.From, TIC.TicIn.Area) == 0)) {
-
-				/*
-				 * Comparing of the filename must be done in 
-				 * two parts, before and after the dot.
-				 */
-				if (strlen(magic.Mask) == strlen(TIC.NewName)) {
-					for (i = 0; i < strlen(magic.Mask); i++) {
-						switch (magic.Mask[i]) {
-							case '?':
-								break;
-
-							case '@':
-								if ((TIC.NewName[i] < 'a') || (TIC.NewName[i] > 'z'))
-									DoMagic = FALSE;
-								break;
-
-							case '#':
-								if ((TIC.NewName[i] < '0') || (TIC.NewName[i] > '9'))
-									DoMagic = FALSE;
-								break;
-
-							default:
-								if (TIC.NewName[i] != magic.Mask[i])
-									DoMagic = FALSE;
-						}
-					}
-				}
-
-				if (DoMagic) {
-					fclose(FeM);
-					free(temp);
-					return TRUE;
-				}
+			    default:	if (toupper(TIC.NewName[i]) != toupper(magic.Mask[i]))
+					    DoMagic = FALSE;
 			}
-
+		    }
 		} else {
-			Eof = TRUE;
+		    DoMagic = FALSE;
 		}
 
-	} while (!Eof);
+		if (DoMagic) {
+		    fclose(FeM);
+		    free(temp);
+		    return TRUE;
+		}
+	    }
 
-	free(temp);
-	fclose(FeM);
-	return FALSE;
+	} else {
+	    Eof = TRUE;
+	}
+
+    } while (!Eof);
+
+    free(temp);
+    fclose(FeM);
+    return FALSE;
 }