From: Eric Wong <e@80x24.org>
Date: Sat, 15 Feb 2025 11:10:05 +0000 (+0000)
Subject: edit: use autodie and favor flush over autoflush
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42957d73f8f34cff92fb29ff6cdab276d5468cfd;p=thirdparty%2Fpublic-inbox.git

edit: use autodie and favor flush over autoflush

Using a single ->flush reduces iops for the (default) non-raw
case and autodie for `open' makes error messages more
consistent.
---

diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index c76579e4b..a363f0c88 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -5,7 +5,8 @@
 # Used for editing messages in a public-inbox.
 # Supports v2 inboxes only, for now.
 use strict;
-use warnings;
+use v5.10.1; # TODO: check unicode_strings compat
+use autodie qw(open);
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 use PublicInbox::AdminEdit;
 use File::Temp 0.19 (); # 0.19 for TMPDIR
@@ -142,7 +143,6 @@ my %tmpopt = (
 
 foreach my $to_edit (values %$found) {
 	my $edit_fh = File::Temp->new(%tmpopt);
-	$edit_fh->autoflush(1);
 	my $edit_fn = $edit_fh->filename;
 	my ($ibx, $smsg) = @{$to_edit->[0]};
 	my $old_raw = $ibx->msg_by_smsg($smsg);
@@ -151,12 +151,11 @@ 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"
-			or die "failed to write From_ line: $!";
+		print $edit_fh "From mboxrd\@$oid Thu Jan  1 00:00:00 1970\n";
 		$tmp =~ s/^(>*From )/>$1/gm;
 	}
-	print $edit_fh $tmp or
-		die "failed to write tempfile for editing: $!";
+	print $edit_fh $tmp;
+	$edit_fh->flush or die "E: flush($edit_fn): $!";
 
 	# run the editor, respecting spaces/quote
 retry_edit:
@@ -183,8 +182,7 @@ retry_edit:
 
 	# reread the edited file, not using $edit_fh since $EDITOR may
 	# rename/relink $edit_fn
-	open my $new_fh, '<', $edit_fn or
-		die "can't read edited file ($edit_fn): $!\n";
+	open my $new_fh, '<', $edit_fn;
 	my $new_raw = PublicInbox::IO::read_all $new_fh;
 
 	if (!$opt->{raw}) {