Masato Taruishi
taru****@users*****
2004年 10月 31日 (日) 15:15:24 JST
===================================================================
RCS file: utils/misc/ldifdiff/ldifdiff,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- utils/misc/ldifdiff/ldifdiff 2004/10/30 12:21:14 1.11
+++ utils/misc/ldifdiff/ldifdiff 2004/10/31 06:15:24 1.12
@@ -67,14 +67,15 @@
while ( <$in> ) {
if ( !( $_ =~ /^#/ )) {
if ( $_ eq "\n" ) {
- goto BREAK;
- }
- if( $_ =~ /^([^:]+):/ ) {
- $buf = $buf . $_ if ! $exclude_attr{$1};
+ goto BREAK if !($_ eq "");
} else {
- if ( $_ =~ /^\s+(.*)/ ) {
- chomp $buf;
- $buf = $buf . $1;
+ if( $_ =~ /^([^:]+):/ ) {
+ $buf = $buf . $_ if ! $exclude_attr{$1};
+ } else {
+ if ( $_ =~ /^\s+(.*)/ ) {
+ chomp $buf;
+ $buf = $buf . $1;
+ }
}
}
}
@@ -222,7 +223,7 @@
debug "N: read: $1\n";
$newentry{$1} = $e;
}
-
+
# Check wether the current entry exists both
if ( $newentry{$odn} && $oldentry{$odn} ) {
debug "checking $odn\n";