[patch] ufed-0.35-plus.patch

ufed-0.35-plus.patch (text/plain), 1.29 KB, created by Harald van Dijk (RETIRED) on 2004-12-09 16:37:33 UTC

--- ufed-0.35.orig/ufed.pl
+++ ufed-0.35/ufed.pl
@@ -506,17 +506,26 @@
    $First =~ s![ \t]+! !g;        # remove multiple ' ' , tabs
    $First =~ s! \+! !g;           # remove leading +'s
    $First = ' ' . $First . ' ';   # add leading & trailing space so we can tell 'ab' and 'abc' apart
-   for $u (split (m![ \t\+]+!, $Second))
+   for $u (split (m![ \t]+!, $Second))
    {
       next if ($u eq "");
+      my $r = $u;
+      $r =~ s!\+!\\\+!g;
       if ($u =~ m!^-+!)
       {
-         $u     =~ s!^-!!g;
+         $r     =~ s!^-!!g;
-         $First =~ s! -?$u ! !g;
+         $First =~ s! -?$r ! !g;
       }
+      elsif ($u =~ m!^\++! )
+      {
+         $u     =~ s!^\+!!g;
+         $r     =~ s!^\\\+!!g;
+         $First =~ s! -?$r ! !g;
+         $First .= " $u ";
+      }
       else
       {
-         $First =~ s! $u ! !;
+         $First =~ s! -?$r ! !g;
          $First .= " $u ";
       }
    }
@@ -756,7 +756,7 @@
       {  
          @make_defaults_flags = (); 
          $make_conf_flags =~ s!\-\*!!;
-         $make_conf_flags =~ CleanUpFlags($make_conf_flags);
+         $make_conf_flags = CleanUpFlags($make_conf_flags);
          
          # bug 24670: ufed was ignoring use.defaults when processing the -* syntax
          #            carpaski confirmes that we should be ignoring it