Commit e2d249f8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

fixed to deal with file names that contain colons, as in Windows

parent 4a2ac166

tests/memanalyze.pl

+4 −4
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ while(<STDIN>) { 
    chomp $_;

    chomp $_;

    $line = $_;

    $line = $_;





    if($line =~ /^MEM ([^:]*):(\d*) (.*)/) {

    if($line =~ /^MEM ([^ ]*):(\d*) (.*)/) {

        # generic match for the filename+linenumber

        # generic match for the filename+linenumber

        $source = $1;

        $source = $1;

        $linenum = $2;

        $linenum = $2;
@@ -130,7 +130,7 @@ while(<STDIN>) { 
        }        

        }        

    }

    }

    # FD url.c:1282 socket() = 5

    # FD url.c:1282 socket() = 5

    elsif($_ =~ /^FD ([^:]*):(\d*) (.*)/) {

    elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {

        # generic match for the filename+linenumber

        # generic match for the filename+linenumber

        $source = $1;

        $source = $1;

        $linenum = $2;

        $linenum = $2;
@@ -157,7 +157,7 @@ while(<STDIN>) { 
        }

        }

    }

    }

    # FILE url.c:1282 fopen("blabla") = 0x5ddd

    # FILE url.c:1282 fopen("blabla") = 0x5ddd

    elsif($_ =~ /^FILE ([^:]*):(\d*) (.*)/) {

    elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {

        # generic match for the filename+linenumber

        # generic match for the filename+linenumber

        $source = $1;

        $source = $1;

        $linenum = $2;

        $linenum = $2;
@@ -185,7 +185,7 @@ while(<STDIN>) { 
        }

        }

    }

    }

    # ADDR url.c:1282 getaddrinfo() = 0x5ddd

    # ADDR url.c:1282 getaddrinfo() = 0x5ddd

    elsif($_ =~ /^ADDR ([^:]*):(\d*) (.*)/) {

    elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {

        # generic match for the filename+linenumber

        # generic match for the filename+linenumber

        $source = $1;

        $source = $1;

        $linenum = $2;

        $linenum = $2;