Changeset 6476

Timestamp:

Feb 23, 2006, 5:19:28 PM (20 years ago)

Author:

jhoblitt

Message:

check for # inside fields

Location:

trunk/DataStore/lib/DataStore

Files:

• File/Parser.pm (modified) (2 diffs)
• FileSet/Parser.pm (modified) (2 diffs)

trunk/DataStore/lib/DataStore/File/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.1 2006-02-24 03:14:29 jhoblitt Exp $
+# $Id: Parser.pm,v 1.2 2006-02-24 03:19:28 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -95 +95 @@
 
         # at least fileid, bytes, md5sum, and type fields are required
-
         if (scalar @fields < 4) {
             carp "line $lineno: not enough fields: $line";
             next LINE;
+        }
+
+        # fields are not allowed to contain #
+        foreach my $field (@fields) {
+            if ($field =~ /\#/) {
+                carp "line $lineno: field $field: contains #: $line";
+                next LINE;
+            }
         }
 

trunk/DataStore/lib/DataStore/FileSet/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.2 2006-02-24 02:51:31 jhoblitt Exp $
+# $Id: Parser.pm,v 1.3 2006-02-24 03:19:28 jhoblitt Exp $
 
 package DataStore::FileSet::Parser;
@@ -102 +102 @@
         }
 
+        # fields are not allowed to contain #
+        foreach my $field (@fields) {
+            if ($field =~ /\#/) {
+                carp "line $lineno: field $field: contains #: $line";
+                next LINE;
+            }
+        }
+
         my ($fileset, $datetime, $type) = @fields;