chg: remove x-bit from *.src
new: add ft=perl to all perl *src
mark perl *.src as ft=perl
chg: exim_id_update more perlish
chg: delay the loading of File::FcntlLock
chg: no need to unlock as we close the file
add force option
more perlish, add chown/chmod
add: --verbose to exim_id_update
and updated by Heiko Schlittermann L<hs@schlittermann.de>.
=cut
and updated by Heiko Schlittermann L<hs@schlittermann.de>.
=cut
# Copyright (c) 2023 The Exim Maintainers
# SPDX-License-Identifier: GPL-2.0-or-later
# See the file NOTICE for conditions of use and distribution.
# Copyright (c) 2023 The Exim Maintainers
# SPDX-License-Identifier: GPL-2.0-or-later
# See the file NOTICE for conditions of use and distribution.
# around the 4.97 transition
# around the 4.97 transition
-# This variables should be set by the building process
-my $spool = 'SPOOL_DIRECTORY'; # may be overridden later
-
use strict;
use warnings;
use strict;
use warnings;
+use Fcntl qw(:DEFAULT :seek);
+use File::Basename;
-use Fcntl;
-use File::FcntlLock;
-my %opt;
-my $mode_upgrade;
-my $id;
-
-my $b62 = '[0-9A-Za-z]';
-
-if ( !getopts('hudv', \%opt)
- || $opt{h}
- || !$opt{v} && !$opt{u} && !$opt{d}
- ) {
- &help; exit 1;
-}
-if ($opt{v}) {
- print "exim_id_update:\n",
- "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
- "perl(runtime): $]\n";
- exit 0;
-}
-
-$spool = $ARGV[0] if ($ARGV[0]);
-$mode_upgrade = $opt{u};
-
-sub help(){
- print <<'EOF'
+my $ME = basename($0);
+my $help = <<"EOF";
Utility for one-time down/upgrade of Exim message-id formats
in spool files. Only the filenames and first-line ID tag values
are affected; not message content such as Message-ID fields.
Only -H, -D and -J files are handled.
Utility for one-time down/upgrade of Exim message-id formats
in spool files. Only the filenames and first-line ID tag values
are affected; not message content such as Message-ID fields.
Only -H, -D and -J files are handled.
-Syntax: exim_id_update [-d | -u | -h | -v] [spooldir]
+Usage: $ME [-d | -u | -h | -v] [spooldir]
- -d Downgrade mode
- -h This help message
- -u Upgrade mode
- -v Version
+ -d --downgrade downgrade mode
+ -h --help help message
+ -u --upgrade upgrade mode
+ -v --version show version and exit cleanly
+ --verbose more output about what's going on
+ --force force overwriting (may be required after failure)
+ --dry dry run (do file operations, but cleanup and keep the old files)
-Exactly one of -d or -u must be given.
+Exactly one of -d|--downgrade or -u|--upgrade must be given.
The spool directory defaults to the build-time value,
or can be given as a command-line argument.
EOF
The spool directory defaults to the build-time value,
or can be given as a command-line argument.
EOF
+
+GetOptions(\my %opt,
+ 'help|h!',
+ 'version|v!',
+ 'upgrade|u!',
+ 'downgrade|d!',
+ 'force!',
+ 'verbose!',
+ 'dry!',
+) or print STDERR $help and exit(1);
+
+if ($opt{version}) {
+ print "exim_id_update:\n",
+ "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
+ "perl(runtime): $]\n";
+ exit 0;
+print $help and exit 0 if $opt{help};
+
+# No help requested, do further option processing
+my $spool = $ARGV[0] // 'SPOOL_DIRECTORY'; # This variable should be set by the building process
+
+die "$ME: --upgrade and --downgrade are mutually exclusive\n" if $opt{upgrade} && $opt{downgrade};
+die "$ME: one of --upgrade or --downgrade is required\n" if !$opt{upgrade} && !$opt{downgrade};
+
+require File::FcntlLock;
+File::FcntlLock->import;
+
# For downgrade mode:
# - Check exim not running
# - Wipe any wait-hints DBs, buy just removing the files.
# For downgrade mode:
# - Check exim not running
# - Wipe any wait-hints DBs, buy just removing the files.
# remove old -D
# unlock new -D
#
# remove old -D
# unlock new -D
#
-
-chdir $spool or die "failed cd to $spool";
-find( sub {
- do_file($_)
- if ($_ =~ ($mode_upgrade ? "${b62}{6}-${b62}{6}-${b62}{2}-D" : "${b62}{6}-${b62}{11}-${b62}{4}-D") );
- },
- '.' );
+#
+my $id;
+my $pattern = do {
+ # setup the pattern, creating match groups already
+ my $b62 = qr/(?i:[\da-z])/; # one of the base62 characters
+ $opt{upgrade} ? qr/^(?<prefix>($b62{6})-($b62{6})-($b62{2}))-D$/ : qr/^(?<prefix>($b62{6})-$b62{5}($b62{6})-($b62{2})$b62{2})-D$/;
+};
+
+chdir $spool or die "chdir to $spool: $!\n";
+find( sub { do_file($_) if -f }, '.');
- my $old_dfile = shift;
- my $old_prefix = $old_dfile;
- my ($old_hfile , $new_prefix);
- my ($d_old, $d_new);
- my $line;
-
- $old_prefix =~ s/-D$//;
- $old_hfile = $old_prefix . '-H';
-
- # The -H file must also exist
- return if (! -e $old_hfile);
-
- $new_prefix = $old_prefix;
- if ($mode_upgrade) {
- $new_prefix =~ s/^([^-]*)-([^-]*)-(.*)$/$1-00000$2-${3}00/;
- } else {
- $new_prefix =~ s/^([^-]*)-.....([^-]*)-(..)..$/$1-$2-${3}/;
- }
+ (my $old_dfile = shift) =~ /$pattern/ or return;
- ####### create the new -D file
+ # $1…$4 are set by the regexp match
+ my $old_prefix = $+{prefix};
+ my $new_prefix = $opt{upgrade}
+ ? "$2-00000$3-${4}00"
+ : "$2-$3-$4";
- open $d_old, '+<', $old_dfile
- or die "Can't open file: $!\n";
+ my $old_hfile = "$old_prefix-H";
- # lock the old -D file
- dfile_lock($d_old, $mode_upgrade ? 16 : 23);
- # seek past the first line
- <$d_old>;
+ # The -H file must also exist, otherwise something is broken
+ return if not -e $old_hfile;
+
+ my $old_jfile = "$old_prefix-J";
+ my $new_dfile = "$new_prefix-D";
+ my $new_hfile = "$new_prefix-H";
+ my $new_jfile = "$new_prefix-J";
+
+ print "$old_prefix -> $new_prefix\n" if $opt{verbose};
- # create the new -D file
- $d_new = f_create($new_prefix . '-D');
+ ####### create the new -D file
+ open my $d_old, '+<', $old_dfile or die "Can't open file: $!\n";
+
+ # lock the old -D file and seek past the first line
+ lock_range($d_old, 2 + length($old_prefix)); # 2 for -D
+ <$d_old>;
- # lock the new -D file
- dfile_lock($d_new, $mode_upgrade ? 23 : 16);
+ # create and lock the new -D file
+ my $d_new = f_create($new_dfile, $old_dfile);
+ lock_range($d_new, 2 + length($new_prefix)); # 2 for -D
# write the new message-id to the first line
# write the new message-id to the first line
+ # and copy the rest of the -D file
print $d_new "$new_prefix-D\n";
print $d_new "$new_prefix-D\n";
-
- # copy the rest of the -D file
- while ($line = <$d_old>) {
- print $d_new $line;
- }
+ print $d_new $_ while <$d_old>;
####### create the new -H file
####### create the new -H file
-
- open my $h_old, '<', $old_hfile
- or die "Can't open file: $!\n";
+ open my $h_old, '<', $old_hfile or die "Can't open file: $!\n";
- my $h_new = f_create($new_prefix . '-H');
+ my $h_new = f_create($new_hfile, $old_hfile);
print $h_new "$new_prefix-H\n";
print $h_new "$new_prefix-H\n";
- while ($line = <$h_old>) {
- print $h_new $line;
+ print $h_new $_ while <$h_old>;
+
+ if ($opt{dry}) {
+ unlink $new_hfile, $new_dfile; # make sure they're removed, even if we die during close
+ close $h_new or die "close $new_hfile: $!\n";
+ close $d_new or die "close $new_dfile: $!\n";
+ return; # this will close the all file handles that are still open (and release their locks)
}
###### rename a journal file if it exists
}
###### rename a journal file if it exists
-
- rename $old_prefix . '-J', $new_prefix . '-J' if (-e $old_prefix . '-J');
+ rename $old_jfile => $new_jfile
+ or $!{ENOENT}
+ or die "Can't rename $old_jfile to $new_jfile: $!\n";
+ # close the files we wrote, to be sure that there's nothing wrong
+ # the locks are released implicitly by closing the file handles.
+ close $h_new or die "$h_new: $!\n";
+ close $d_new or die "$d_new: $!\n";
- close $h_old;
- unlink $old_hfile or die "failed to remove $old_hfile";
- close $d_old;
- unlink $old_dfile or die "failed to remove $old_dfile";
+ unlink $old_hfile or die "failed to remove $old_hfile: $!\n";
+ unlink $old_dfile or die "failed to remove $old_dfile: $!\n";
- dfile_unlock($d_new, $mode_upgrade ? 23 : 16);
- close $d_new;
+ # no need to explicitly close the $d_old, $h_old, they're closed
+ # automatically when they go out of scope. And the locks are released
+ # by the OS after closing the files.
my $fh = shift;
my $nbytes = shift;
my $fs = new File::FcntlLock;
my $fh = shift;
my $nbytes = shift;
my $fs = new File::FcntlLock;
or die "Locking failed: " . $fs->error . "\n";
}
or die "Locking failed: " . $fs->error . "\n";
}
-sub dfile_unlock {
- my $fh = shift;
- my $nbytes = shift;
- my $fs = new File::FcntlLock;
-
- $fs->l_type( F_UNLCK );
- $fs->l_whence( SEEK_CUR );
- $fs->l_start( 0 );
- $fs->l_len( $nbytes );
- $fs->lock( $fh, F_SETLK )
- or die "Unlocking failed: " . $fs->error . "\n";
-}
-
- my $filename = shift;
- sysopen(my $fh, $filename, O_RDWR|O_CREAT|O_EXCL)
+ my ($filename, $reference) = @_;
+ sysopen(my $fh, $filename, O_RDWR|O_CREAT| ($opt{force} ? 0 : O_EXCL))
or die "Can't create $filename: $!";
or die "Can't create $filename: $!";
- $fh->autoflush(1);
- #
- # TODO: chown, chgrp exim; chmod 0640
+ my ($perms, $uid, $gid) = (stat $reference)[2,4,5] or die "Can't stat reference $reference: $!\n";
+ chown $uid, $gid => $fh or die "chown $filename: $!\n";
+ chmod $perms & 07777 => $fh or die "chmod $filename: $!\n";
L<Exim spec.txt chapter 4|https://exim.org/exim-html-current/doc/html/spec_html/ch-how_exim_receives_and_delivers_mail.html#SECTmessiden>
=cut
L<Exim spec.txt chapter 4|https://exim.org/exim-html-current/doc/html/spec_html/ch-how_exim_receives_and_delivers_mail.html#SECTmessiden>
=cut
while($#c >= 0) { $s = $s * $base + $tab62[ord(shift @c) - ord('0')] }
return $s;
}
while($#c >= 0) { $s = $s * $base + $tab62[ord(shift @c) - ord('0')] }
return $s;
}
$count, &print_volume_rounded($volume), $max_age, $min_age, "TOTAL");
print "\n";
$count, &print_volume_rounded($volume), $max_age, $min_age, "TOTAL");
print "\n";
printf(STDOUT "%s\n", $_);
}
printf(STDOUT "%s\n", $_);
}
git://git.exim.org / exim.git / commitdiff