|
Line
Link Here
|
| 0 |
-- ufed-0.35.orig/ufed.pl |
0 |
++ ufed-0.35/ufed.pl |
|
Lines 506-522
Link Here
|
| 506 |
$First =~ s![ \t]+! !g; # remove multiple ' ' , tabs |
506 |
$First =~ s![ \t]+! !g; # remove multiple ' ' , tabs |
| 507 |
$First =~ s! \+! !g; # remove leading +'s |
507 |
$First =~ s! \+! !g; # remove leading +'s |
| 508 |
$First = ' ' . $First . ' '; # add leading & trailing space so we can tell 'ab' and 'abc' apart |
508 |
$First = ' ' . $First . ' '; # add leading & trailing space so we can tell 'ab' and 'abc' apart |
| 509 |
for $u (split (m![ \t\+]+!, $Second)) |
509 |
for $u (split (m![ \t]+!, $Second)) |
| 510 |
{ |
510 |
{ |
| 511 |
next if ($u eq ""); |
511 |
next if ($u eq ""); |
|
|
512 |
my $r = $u; |
| 513 |
$r =~ s!\+!\\\+!g; |
| 512 |
if ($u =~ m!^-+!) |
514 |
if ($u =~ m!^-+!) |
| 513 |
{ |
515 |
{ |
| 514 |
$u =~ s!^-!!g; |
516 |
$r =~ s!^-!!g; |
| 515 |
$First =~ s! -?$u ! !g; |
517 |
$First =~ s! -?$r ! !g; |
| 516 |
} |
518 |
} |
|
|
519 |
elsif ($u =~ m!^\++! ) |
| 520 |
{ |
| 521 |
$u =~ s!^\+!!g; |
| 522 |
$r =~ s!^\\\+!!g; |
| 523 |
$First =~ s! -?$r ! !g; |
| 524 |
$First .= " $u "; |
| 525 |
} |
| 517 |
else |
526 |
else |
| 518 |
{ |
527 |
{ |
| 519 |
$First =~ s! $u ! !; |
528 |
$First =~ s! -?$r ! !g; |
| 520 |
$First .= " $u "; |
529 |
$First .= " $u "; |
| 521 |
} |
530 |
} |
| 522 |
} |
531 |
} |
|
Lines 756-762
Link Here
|
| 756 |
{ |
756 |
{ |
| 757 |
@make_defaults_flags = (); |
757 |
@make_defaults_flags = (); |
| 758 |
$make_conf_flags =~ s!\-\*!!; |
758 |
$make_conf_flags =~ s!\-\*!!; |
| 759 |
$make_conf_flags =~ CleanUpFlags($make_conf_flags); |
759 |
$make_conf_flags = CleanUpFlags($make_conf_flags); |
| 760 |
|
760 |
|
| 761 |
# bug 24670: ufed was ignoring use.defaults when processing the -* syntax |
761 |
# bug 24670: ufed was ignoring use.defaults when processing the -* syntax |
| 762 |
# carpaski confirmes that we should be ignoring it |
762 |
# carpaski confirmes that we should be ignoring it |
