Changeset 278

Timestamp:

10/02/07 16:07:57 (1 year ago)

Author:

knok

Message:

Added 'regex' and 'search' type for magic entry.
Modified for stability.

Files:

• MMagic/trunk/ChangeLog (modified) (1 diff)
• MMagic/trunk/MMagic.pm (modified) (12 diffs)

MMagic/trunk/ChangeLog

@@ +1 @@
+2007-10-02  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * MMagic.pm: Added 'regex' and 'search' support for magic entry,
+          and fixed fatal error when unknown type in magic entry.
+          (The patch made by Man Min Yan, thank you).
+
-2006-09-19  NOKUBI Takatsugu  <knok@daionet.gr.jp>
-

MMagic/trunk/MMagic.pm

@@ -787 +787 @@
-    if (@$item == 3){
-        my $tmp = readMagicLine(@$item);
+        return unless defined($tmp);
-        @$item = @$tmp;
-    }
@@ -825 +826 @@
-    }
-
-
+ || $type =~ /^regex/
-        # read the length of the match string unless the
-        # comparison is '>' ($numbytes == 0), in which case 
@@ -850 +851 @@
-            $match = ($data gt $testval);
-        }
+        elsif ($op eq 'match') {
+            $data = ($data || '') ? $data : '';
+            $match = $data =~ /$testval/;
+        }
-        # else bogus op, but don't die, just skip
-
@@ -856 +861 @@
-        }
-
+    }
+    elsif ($type =~ /^search\//)
+    {
-    }
-    else {
@@ -985 +993 @@
-    }
-
-
+ || $type =~ /^regex/
-        # read the length of the match string unless the
-        # comparison is '>' ($numbytes == 0), in which case 
@@ -1007 +1015 @@
-            $match = ($data gt $testval);
-        }
+        elsif ($op eq 'match') {
+            $match = eval {($data || '') =~ /$testval/};
+        }
+
-        # else bogus op, but don't die, just skip
-
@@ -1013 +1025 @@
-        }
-
+    }
+    elsif ($type =~ /^search\//)
+    {
-    }
-    else {
@@ -1248 +1263 @@
-    
-    # check if type is valid
-
+ && $type !~ /^regex/ && $type !~ /^search\//
-        warn "Invalid type '$type' at line $line_num\n";
-        return;
@@ -1266 +1281 @@
-
-    # get the operator.  if 'x', must be alone.  default is '='.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
+
+
-        $testval = $line;
-
@@ -1301 +1322 @@
-            $numbytes = length($testval);
-            $operator = '=';
+        }
+        elsif ($operator eq 'match') {
+            eval {"" =~ /$testval/};    # Check the regex
+            warn "Invalid regex at line $line_num - $@\n" if ($@);
+            $numbytes = 0;
-        }
-        else {
@@ -1311 +1337 @@
-            return;
-        }
+    }
+    elsif ($type =~ /^search\//)
+    {
-    }
-    else {
@@ -1350 +1379 @@
-        if (@$entry == 3){
-            my $tmp = readMagicLine(@$entry);
+            next if (! $tmp);
-            @$entry = @$tmp;
-        }