Index: Slim/Formats/Parse.pm
===================================================================
--- Slim/Formats/Parse.pm	(revision 2286)
+++ Slim/Formats/Parse.pm	(working copy)
@@ -115,7 +115,11 @@
 
 	my @items  = ();
 	my $title;
-	
+
+	if ($] > 5.007) {
+		binmode($m3u, ":encoding($Slim::Utils::Misc::locale)");
+	}
+
 	$::d_parse && Slim::Utils::Misc::msg("parsing M3U: $m3u\n");
 
 	while (my $entry = <$m3u>) {
@@ -150,6 +154,8 @@
 
 	$::d_parse && Slim::Utils::Misc::msg("parsed " . scalar(@items) . " items in m3u playlist\n");
 
+	close $m3u;
+
 	return @items;
 }
 
@@ -161,6 +167,9 @@
 	my @items  = ();
 	
 	# parse the PLS file format
+	if ($] > 5.007) {
+		binmode($pls, ":encoding($Slim::Utils::Misc::locale)");
+	}
 
 	$::d_parse && Slim::Utils::Misc::msg("Parsing playlist: $pls \n");
 	
@@ -199,6 +208,8 @@
 		push @items, $entry;
 	}
 
+	close $pls;
+
 	return @items;
 }
 
@@ -413,6 +424,8 @@
 		push @lines, $line;
 	}
 
+	close $cuefile;
+
 	# Don't redecode it.
 	return (parseCUE([@lines], $cuedir, undef, 1));
 }
@@ -421,22 +434,10 @@
 	my $listref = shift;
 	my $playlistname = shift || "SlimServer " . Slim::Utils::Strings::string("PLAYLIST");
 	my $filename = shift;
-	my $output;
-	my $outstring = '';
-	my $writeproc;
 
-	if ($filename) {
+	my $string = '';
+	my $output = _filehandleFromNameOrString($filename, $string);
 
-		$output = FileHandle->new($filename, "w") || do {
-			Slim::Utils::Misc::msg("Could not open $filename for writing.\n");
-			return;
-		};
-
-	} else {
-
-		$output = IO::String->new($outstring);
-	}
-
 	print $output "[playlist]\nPlaylistName=$playlistname\n";
 
 	my $itemnum = 0;
@@ -461,12 +462,8 @@
 
 	print $output "NumberOfItems=$itemnum\nVersion=2\n";
 
-	if ($filename) {
-		close $output;
-		return;
-	}
-
-	return $outstring;
+	close $output;
+	return $string;
 }
 
 sub writeM3U {
@@ -475,21 +472,10 @@
 	my $filename = shift;
 	my $addTitles = shift;
 	my $resumetrack = shift;
-	my $output;
-	my $outstring = '';
-	my $writeproc;
 
-	if ($filename) {
+	my $string = '';
+	my $output = _filehandleFromNameOrString($filename, $string);
 
-		$output = FileHandle->new($filename, "w") || do {
-			Slim::Utils::Misc::msg("Could not open $filename for writing.\n");
-			return;
-		};
-
-	} else {
-		$output = IO::String->new($outstring);
-	}
-
 	print $output "#CURTRACK $resumetrack\n" if defined($resumetrack);
 	print $output "#EXTM3U\n" if $addTitles;
 
@@ -510,12 +496,8 @@
 		printf($output "%s\n", _pathForItem($item));
 	}
 
-	if ($filename) {
-		close $output;
-		return;
-	}
-
-	return $outstring;
+	close $output;
+	return $string;
 }
 
 sub readWPL {
@@ -614,24 +596,13 @@
 	# "XMLout")
 	my $wplfile = XMLout($wpl_playlist, XMLDecl => '<?wpl version="1.0"?>', RootName => undef);
 
-	if ($filename) {
+	my $string;
 
-		my $output = FileHandle->new($filename, "w") || do {
-			Slim::Utils::Misc::msg("Could not open $filename for writing.\n");
-			return;
-		};
+	my $output = _filehandleFromNameOrString($filename, $string);
+	print $output $wplfile;
+	close $output;
 
-		print $output "$wplfile";
-		close $output;
-		return;
-
-	} else {
-
-		my $outstring;
-		my $output = IO::String->new($outstring);
-		print $output $wplfile;
-		return($outstring);
-	}
+	return $string;
 }
 
 sub readASX {
@@ -645,6 +616,7 @@
 	while (<$asxfile>) {
 		$asxstr .= $_;
 	}
+	close $asxfile;
 
 	# First try for version 3.0 ASX
 	if ($asxstr =~ /<ASX/i) {
@@ -737,6 +709,31 @@
 	return $item;
 }
 
+sub _filehandleFromNameOrString {
+	my $filename  = shift;
+	my $outstring = shift;
+
+	my $output;
+
+	if ($filename) {
+
+		$output = FileHandle->new($filename, "w") || do {
+			Slim::Utils::Misc::msg("Could not open $filename for writing.\n");
+			return;
+		};
+
+		if ($] > 5.007) {
+			binmode($output, ":encoding($Slim::Utils::Misc::locale)");
+		}
+
+	} else {
+
+		$output = IO::String->new($outstring);
+	}
+
+	return $output;
+}
+
 1;
 
 __END__