Changeset 314 for LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm

Timestamp:

08/08/09 16:25:16 (15 years ago)

Author:

nanardon

Message:

• allow continuation line

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm (modified) (3 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm

@@ -59 +59 @@
     my $acl;
     my $line_nb = 0;
+    my $prevline = "";
     if (open(my $handle, '<', $file)) {
         while(my $realline = <$handle>) {
             $line_nb++;
-            my $line = $realline; # keep track to report malformed file
+            chomp($realline);
+            if ($realline =~ /\\$/) {
+                # continuation line
+                $prevline .= $realline;
+                $prevline =~ s/\s*\\$//;
+                next;
+            }
+            my $line = $prevline . $realline; # keep track to report malformed file
+            $prevline = "";
             $line =~ s/\s*#.*//;
-            if ($line =~ /^(\S+)\s*$/) {
+            if ($line =~ /^(\S.*)/) {
                 if ($acl) {
                     push(@{$self->{_acls}}, $acl);
@@ -73 +82 @@
                     return;
                 };
-            } elsif ($line =~ /\s+(\S+)/) {
+            } elsif ($line =~ /^\s+(\S.*)/) {
                 if ($acl) {
                     $acl->add_perm($line) or do {
@@ -121 +130 @@
 sub new {
     my ($class, $objdotatt, $list) = @_;
-    my ($obj, $attr) = $objdotatt =~ /^([^.]+)\.(\S+)/;
+    my ($obj, $attr) = $objdotatt =~ /^([^.]+)\.(.*)/;
     my @attrs = ($attr =~ /^\{(.*)\}$/)
-        ? (split(',', $1))
+        ? (split(/\s*,\s*/, $1))
         : ($attr);
     @attrs or return;