doc: re-add missing 1.6 release notes

[public-inbox.git] / script / public-inbox-watch

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index b6c6b2022bb7ae64e6aae5e4cccaa73b68866e59..86349d71d415ba12314411f25e87b0c227018022 100755 (executable)
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -1,14 +1,25 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+my $help = <<EOF;
+usage: public-inbox-watch
+
+See public-inbox-watch(1) man page for full documentation.
+EOF
+
 use strict;
-use IO::Handle;
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+use IO::Handle; # ->autoflush
 use PublicInbox::Watch;
 use PublicInbox::Config;
 use PublicInbox::DS;
 use PublicInbox::Sigfd;
-use PublicInbox::Syscall qw($SFD_NONBLOCK);
-my $oldset = PublicInbox::Sigfd::block_signals();
+use PublicInbox::Syscall qw(SFD_NONBLOCK);
+my $do_scan = 1;
+GetOptions('scan!' => \$do_scan, # undocumented, testing only
+       'help|h' => \(my $show_help)) or do { print STDERR $help; exit 1 };
+if ($show_help) { print $help; exit 0 };
+my $oldset = PublicInbox::DS::block_signals();
 STDOUT->autoflush(1);
 STDERR->autoflush(1);
 local $0 = $0; # local since this script may be eval-ed
@@ -44,13 +55,12 @@ if ($watch) {
        $sig->{QUIT} = $sig->{TERM} = $sig->{INT} = $quit;
 
        # --no-scan is only intended for testing atm, undocumented.
-       unless (grep(/\A--no-scan\z/, @ARGV)) {
-               PublicInbox::DS::requeue($scan);
-       }
-       my $sigfd = PublicInbox::Sigfd->new($sig, $SFD_NONBLOCK);
-       local %SIG = (%SIG, %$sig) if !$sigfd;
+       PublicInbox::DS::requeue($scan) if $do_scan;
+
+       my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
+       local @SIG{keys %$sig} = values(%$sig) unless $sigfd;
        if (!$sigfd) {
-               PublicInbox::Sigfd::set_sigmask($oldset);
+               PublicInbox::DS::sig_setmask($oldset);
                PublicInbox::DS->SetLoopTimeout(1000);
        }
        $watch->watch($sig, $oldset) while ($watch);