From 2f861a437094ba6d5106b3b96823788b935f82f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Oct 2007 19:47:53 -0400
Subject: [PATCH 1/1] bugfixes developed while writing blog post

---
 mr | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/mr b/mr
index 8eb0374..96f3a16 100755
--- a/mr
+++ b/mr
@@ -346,7 +346,7 @@ sub action {
 
 	if (exists $config{$topdir}{$subdir}{deleted}) {
 		if (! -d $dir) {
-			next;
+			return;
 		}
 		else {
 			my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
@@ -463,6 +463,10 @@ sub loadconfig {
 		$dir="";
 	}
 	else {
+		if (! -e $f) {
+			return;
+		}
+
 		my $absf=abs_path($f);
 		if ($loaded{$absf}) {
 			return;
@@ -551,14 +555,28 @@ sub modifyconfig {
 	my %changefields=@_;
 
 	my @lines;
+	my @out;
+
 	if (-e $f) {
 		open(my $in, "<", $f) || die "mr: open $f: $!\n";
 		@lines=<$in>;
 		close $in;
 	}
 
+	my $addfields=sub {
+		my @blanks;
+		while ($out[$#out] =~ /^\s*$/) {
+			unshift @blanks, pop @out;
+		}
+		foreach my $field (sort keys %changefields) {
+			if (length $changefields{$field}) {
+				push @out, "$field = $changefields{$field}\n";
+			}
+		}
+		push @out, @blanks;
+	};
+
 	my $section;
-	my @out;
 	while (@lines) {
 		$_=shift(@lines);
 
@@ -568,16 +586,7 @@ sub modifyconfig {
 		elsif (/^\s*\[([^\]]*)\]\s*$/) {
 			if (defined $section && 
 			    $section eq $targetsection) {
-				my @blanks;
-				while ($out[$#out] =~ /^\s*$/) {
-					unshift @blanks, pop @out;
-				}
-				foreach my $field (sort keys %changefields) {
-					if (length $changefields{$field}) {
-						push @out, "$field = $changefields{$field}\n";
-					}
-				}
-				push @out, @blanks;
+				$addfields->();
 			}
 
 			$section=$1;
@@ -607,7 +616,11 @@ sub modifyconfig {
 		}
 	}
 
-	if (%changefields) {
+	if (defined $section && 
+	    $section eq $targetsection) {
+			$addfields->();
+	}
+	elsif (%changefields) {
 		push @out, "\n[$targetsection]\n";
 		foreach my $field (sort keys %changefields) {
 			if (length $changefields{$field}) {
-- 
2.39.5