From 7c72b0ac881b24c81bd7840bf8c39be223174e1b Mon Sep 17 00:00:00 2001
From: Ward Wouts <ward@wouts.nl>
Date: Sun, 25 Jan 2004 15:14:20 +0000
Subject: [PATCH] line numbers with every die()

---
 mycp/mycp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mycp/mycp b/mycp/mycp
index fef2277..0f111a5 100755
--- a/mycp/mycp
+++ b/mycp/mycp
@@ -107,9 +107,9 @@ sub cmdline {
 
 sub readconfig {
 	if ( -f "$ENV{HOME}/.mycprc" && -r "$ENV{HOME}/.mycprc" ) {
-		do "$ENV{HOME}/.mycprc" or die "Couldn't parse $ENV{HOME}/.mycprc\n";
+		do "$ENV{HOME}/.mycprc" or die "Couldn't parse $ENV{HOME}/.mycprc";
 	} elsif ( -f "/etc/mycp" && -r "/etc/mycp" ) {
-		do "/etc/mycp" or die "Couldn't parse /etc/mycp\n";
+		do "/etc/mycp" or die "Couldn't parse /etc/mycp";
 	}
 }
 
@@ -135,7 +135,7 @@ sub backup($) {
 		print "Creating \"$dir/OLD\" directory\n";
 		unless ( -d "$dir/OLD" ) {
 			if ( -w $dir ) {
-				mkdir "$dir/OLD", 0777 or die "Couldn't create $dir/OLD: $!\n";
+				mkdir "$dir/OLD", 0777 or die "Couldn't create $dir/OLD: $!";
 			} else {
 				system("$sudocmd mkdir " . &escape("$dir/OLD"));
 			}
@@ -151,13 +151,13 @@ sub backup($) {
 		}
 
 		if ( -w $file || -w &fullpath($file) ) {
-			copy("$file", "$backup") or die "Couldn't copy $file to $backup: $!\n";
+			copy("$file", "$backup") or die "Couldn't copy $file to $backup: $!";
 		} else {
 			system("$sudocmd $cpcmd " . &escape($file) . " " . &escape($backup));
 		}
 
 	} else {
-		die "No such file: $file\n";
+		die "No such file: $file";
 	}
 }
 
@@ -270,7 +270,7 @@ sub cvsadd($) {
 	print "FILE: $file\n";
 	print "PATH: $checkpath\n";
 	chdir $cwd;
-	copy($file, $checkpath) || die "error copying file to cvstree: $!\n";
+	copy($file, $checkpath) || die "error copying file to cvstree: $!";
 	chdir $checkpath;
 	system("$cvscmd add " . &escape(basename($file)));
 	chdir $cwd;
@@ -324,10 +324,10 @@ sub cmptocvs($) {
 sub cmp($$) {
 	my $source = shift;
 	my $target = shift;
-	open(FH, "<$source") or die "Couldn't open file $source: $!\n";
+	open(FH, "<$source") or die "Couldn't open file $source: $!";
 	my $sf = do { local $/; <FH> };
 	close(FH);
-	open(FH, "<$target") or die "Couldn't open file $target: $!\n";
+	open(FH, "<$target") or die "Couldn't open file $target: $!";
 	my $tf = do { local $/; <FH> };
 	close(FH);
 	$tf eq $sf;
@@ -368,7 +368,7 @@ sub fullpath($) {
 
 sub slurp($) {
 	my $file = shift;
-	open(FH, "<$file") or die "Couldn't open $file: $!\n";
+	open(FH, "<$file") or die "Couldn't open $file: $!";
 	my $result = do { local $/; <FH>; };
 	close FH;
 	return $result;