#!/usr/bin/perl

my $no = "0";
my $no = shift if ($ARGV[0] eq 'no');

my %origin = ('---' => '--- old-',
	      '+++' => '+++ ');
my %paths;

open(I,"paths");
while (<I>) {
    chomp($_);
    @a = /(\S+) (.*)/;
    $a[1] .= "/" if ($a[1] !~ /\/$/);
    $paths{$a[0]} = $a[1];
    $paths{"$a[0].orig"} = $a[1];
}

while(<>) {
    s/^(---|\+\+\+) +(\S*)/$origin{$1}$paths{$2}$2/ unless($no eq 'no');
    print;
}


exit 0;