isync

commit 83bb1cf716d5f44b773b952aa789aadac04171b2
parent f044adbfa423f4b88c50d4f990c7d8d6d0a3241b
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sat, 16 Nov 2013 13:21:45 +0100

make state loading in showstate() similar to ckstate()

Diffstat:
M
src/run-tests.pl
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/run-tests.pl b/src/run-tests.pl
@@ -362,34 +362,32 @@ sub showstate($)
 		print STDERR " Cannot read sync state $fn: $!\n";
 		return;
 	}
-	$_ = <FILE>;
+	chomp(my @ls = <FILE>);
+	close FILE;
+	$_ = shift(@ls);
 	if (!defined $_) {
 		print STDERR " Missing sync state header.\n";
-		close FILE;
 		return;
 	}
-	if (!/^1:(\d+) 1:(\d+):(\d+)\n$/) {
-		chomp;
+	if (!/^1:(\d+) 1:(\d+):(\d+)$/) {
 		print STDERR " Malformed sync state header '$_'.\n";
-		close FILE;
 		return;
 	}
 	print " [ $1, $2, $3,\n   ";
 	my $frst = 1;
-	for (<FILE>) {
+	for (@ls) {
 		if ($frst) {
 			$frst = 0;
 		} else {
 			print ", ";
 		}
-		if (!/^(-?\d+) (-?\d+) (.*)\n$/) {
+		if (!/^(-?\d+) (-?\d+) (.*)$/) {
 			print "??, ??, \"??\"";
 		} else {
 			print "$1, $2, \"$3\"";
 		}
 	}
 	print " ],\n";
-	close FILE;
 }
 
 # $filename