[PATCH 0/2] edit: minor bug fixes

[PATCH 0/2] edit: minor bug fixes

[Eric Wong]

A few minor bugfixes I noticed while working on other stuff...

Eric Wong (2):
  edit: propagate correct editor exit code
  edit: check for write errors writing "From_" line

 script/public-inbox-edit | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

[PATCH 1/2] edit: propagate correct editor exit code

[Eric Wong]

exit($?) is never correct, since ($? >> 8) is needed to extract
the correct exit code, as other information (e.g. such as signal)
is encoded in $? in addition to the exit code.
---
 script/public-inbox-edit | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index f2090abf..24b7ed8b 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -149,7 +149,11 @@ retry_edit:
 			chomp(my $op = <STDIN> || '');
 			$op = lc($op);
 			goto retry_edit if $op eq 'r';
-			exit $? if $op eq 'q';
+			if ($op eq 'q') {
+				# n.b. we'll lose the exit signal, here,
+				# oh well; "q" is user-specified anyways.
+				exit($? >> 8);
+			}
 			last if $op eq 'c'; # continuing
 			print STDERR "\`$op' not recognized\n";
 		}

[PATCH 2/2] edit: check for write errors writing "From_" line

[Eric Wong]

We need to check every print to a regular file for errors,
because storage devices inevitably fail.
---
 script/public-inbox-edit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index 24b7ed8b..43ce9900 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -130,7 +130,8 @@ foreach my $to_edit (values %$found) {
 	my $tmp = $$old_raw;
 	if (!$opt->{raw}) {
 		my $oid = $smsg->{blob};
-		print $edit_fh "From mboxrd\@$oid Thu Jan  1 00:00:00 1970\n";
+		print $edit_fh "From mboxrd\@$oid Thu Jan  1 00:00:00 1970\n"
+			or die "failed to write From_ line: $!";
 		$tmp =~ s/^(>*From )/>$1/gm;
 	}
 	print $edit_fh $tmp or