Merge the two read_mh_path implementations

1 files changed, 6 insertions, 21 deletions

diff --git a/tpnotify b/tpnotify
index 63f379a..67b0436 100755
--- a/tpnotify
+++ b/tpnotify
@@ -252,7 +252,9 @@ sub expand_template {
 }
 
 sub read_mh_path {
-    if (open(my $fd, '<', "$ENV{HOME}/.mh_profile")) {
+    my $file = File::Spec->catfile($ENV{HOME}, '.mh_profile');
+    if (-f $file) {
+	if (open(my $fd, '<', $file)) {
 	    my $prev;
 	    while (<$fd>) {
 		chomp;
@@ -265,6 +267,9 @@ sub read_mh_path {
 	    }
 	    close $fd;
 	    return $prev if $prev =~ s/^Path:\s+//;
+	} else {
+	    err("can't open $file: $!", prefix => 'warning');
+	}
     }
     return "$ENV{HOME}/Mail";
 }
@@ -338,26 +343,6 @@ sub mail_box_manager_refile {
     $folder->close;
 }
 
-sub read_mh_path {
-    my $file = File::Spec->catfile($ENV{HOME}, '.mh_profile');
-    my $path;
-    if (-f $file) {
-	if (open(my $fd, '<', $file)) {
-	    while (<$fd>) {
-		chomp;
-		if (s/Path:\s*(.+)/$1/) {
-		    $path = $1;
-		    last;
-		}
-	    }
-	    close $path;
-	}
-    } else {
-	err("can't open $file: $!", prefix => 'warning');
-    }
-    return $path;
-}
-
 sub movemail_supported {
     if (open(my $fd, '-|', 'movemail --version')) {
 	chomp($_ = <$fd>);