Changeset 304

Show
Ignore:
Timestamp:
09/04/04 23:33:13 (8 years ago)
Author:
jimmyo
Message:

Handle strange characters better.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/node/node.d/snmp__df.in

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r302 r304  
    22# 
    33# $Log$ 
     4# Revision 1.4  2004/09/04 21:33:12  jimmyo 
     5# Handle strange characters better. 
     6# 
    47# Revision 1.3  2004/09/04 21:08:16  jimmyo 
    58# SNMP df plugin now talks Windowese. 
    …… 
    141144                my $part = get_single ($session, $hrStorageDesc . $id); 
    142145                $part =~ s/ Label: +Serial Number.+$//; 
     146                $part =~ s/\\//g; 
    143147                $partitions{$part}{storage} = $id; 
    144148                $stor_id->{$id} = $part; 

  • trunk/server/Munin.pm.in

    • Property cvs2svn:cvs-rev changed from 1.17 to 1.18
    r292 r304  
    55# 
    66# $Log$ 
     7# Revision 1.18  2004/09/04 21:33:13  jimmyo 
     8# Handle strange characters better. 
     9# 
    710# Revision 1.17  2004/09/01 19:00:22  jimmyo 
    811# Moved function get_picture_filename from munin-graph to Munin.pm. 
    …… 
    347350            $prevline = ""; 
    348351        } 
    349         if ($line =~ /\\$/) 
     352        if ($line =~ /\\\\$/) 
     353        { 
     354            $line =~ s/\\\\$/\\/; 
     355        } 
     356        elsif ($line =~ /\\$/) 
    350357        { 
    351358            ($prevline = $line) =~ s/\\$//; 
    …… 
    554561        { 
    555562            print "Writing: $pre$a $data->{$a}\n" if $DEBUG; 
    556             print $fh "$pre$a $data->{$a}\n"; 
     563            if ($data->{$a} =~ /\\$/) 
     564            { # Backslash as last char has special meaning. Avoid it. 
     565                print $fh "$pre$a $data->{$a}\\\n";  
     566            } else { 
     567                print $fh "$pre$a $data->{$a}\n"; 
     568            } 
    557569        } 
    558570    } 

  • trunk/server/munin-graph.in

    • Property cvs2svn:cvs-rev changed from 1.27 to 1.28
    r292 r304  
    66# 
    77# $Log$ 
     8# Revision 1.28  2004/09/04 21:33:13  jimmyo 
     9# Handle strange characters better. 
     10# 
    811# Revision 1.27  2004/09/01 19:00:22  jimmyo 
    912# Moved function get_picture_filename from munin-graph to Munin.pm. 
    …… 
    11641167    my $text = shift; 
    11651168    return undef if not defined $text; 
     1169    $text =~ s/\\/\\\\/g; 
    11661170    $text =~ s/:/\\:/g; 
    11671171    return $text; 

  • trunk/server/munin-update.in

    • Property cvs2svn:cvs-rev changed from 1.12 to 1.13
    r284 r304  
    66# 
    77# $Log$ 
     8# Revision 1.13  2004/09/04 21:33:13  jimmyo 
     9# Handle strange characters better. 
     10# 
    811# Revision 1.12  2004/08/31 18:12:59  jimmyo 
    912# Sanitise incoming field names a bit better. 
    …… 
    641644        my ($client,$type,$value) = ($1,$2,$3); 
    642645        $client = &sanitize_fieldname ($client); 
     646        if (($type) and ($type eq "label")) { 
     647            $value =~ s/\\/_/g; # Sanitise labels 
     648        } 
    643649        $node->{client}->{$servname}->{$client.".".$type} = "$value"; 
    644650        logger ("config: $name->$client.$type = $value") if $DEBUG;