about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-06-04 08:40:34 +0000
committerEric Wong <e@80x24.org>2019-06-04 10:06:18 +0000
commitd3906fed88f403552d1629e9ecc9974ab85abaae (patch)
tree44eece4dff4ac1e7e91566400c32ddb024682ca8 /lib
parentb04bdc8cd749dd3dfcc9351b2b47bfdf190b4a3a (diff)
downloadpublic-inbox-d3906fed88f403552d1629e9ecc9974ab85abaae.tar.gz
In case some BOFH decides to randomly create directories
using non-ASCII digits all over the place.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/Inbox.pm4
-rw-r--r--lib/PublicInbox/Search.pm2
-rw-r--r--lib/PublicInbox/V2Writable.pm4
-rw-r--r--lib/PublicInbox/Xapcmd.pm6
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 04d2f832..c9330332 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -87,7 +87,7 @@ sub _set_limiter ($$$) {
                 my $mkey = $pfx.'max';
                 my $val = $self->{$mkey} or return;
                 my $lim;
-                if ($val =~ /\A\d+\z/) {
+                if ($val =~ /\A[0-9]+\z/) {
                         require PublicInbox::Qspawn;
                         $lim = PublicInbox::Qspawn::Limiter->new($val);
                 } elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
@@ -161,7 +161,7 @@ sub max_git_part {
                 if (opendir my $dh, $gits) {
                         my $max = -1;
                         while (defined(my $git_dir = readdir($dh))) {
-                                $git_dir =~ m!\A(\d+)\.git\z! or next;
+                                $git_dir =~ m!\A([0-9]+)\.git\z! or next;
                                 $max = $1 if $1 > $max;
                         }
                         $part = $self->{-max_git_part} = $max if $max >= 0;
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index c054a874..9903f427 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -144,7 +144,7 @@ sub _xdb ($) {
         my $qpf = \($self->{qp_flags} ||= $QP_FLAGS);
         if ($self->{version} >= 2) {
                 foreach my $part (<$dir/*>) {
-                        -d $part && $part =~ m!/\d+\z! or next;
+                        -d $part && $part =~ m!/[0-9]+\z! or next;
                         my $sub = Search::Xapian::Database->new($part);
                         if ($xdb) {
                                 $xdb->add_database($sub);
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 76844cd4..a8c33ef4 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -48,7 +48,7 @@ sub count_partitions ($) {
         # due to -compact
         if (-d $xpfx) {
                 foreach my $part (<$xpfx/*>) {
-                        -d $part && $part =~ m!/\d+\z! or next;
+                        -d $part && $part =~ m!/[0-9]+\z! or next;
                         eval {
                                 Search::Xapian::Database->new($part)->close;
                                 $nparts++;
@@ -574,7 +574,7 @@ sub git_dir_latest {
         my $latest;
         opendir my $dh, $pfx or die "opendir $pfx: $!\n";
         while (defined(my $git_dir = readdir($dh))) {
-                $git_dir =~ m!\A(\d+)\.git\z! or next;
+                $git_dir =~ m!\A([0-9]+)\.git\z! or next;
                 if ($1 > $$max) {
                         $$max = $1;
                         $latest = "$pfx/$git_dir";
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 90672310..dad080c8 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -150,7 +150,7 @@ sub run {
         } else {
                 opendir my $dh, $old or die "Failed to opendir $old: $!\n";
                 while (defined(my $dn = readdir($dh))) {
-                        if ($dn =~ /\A\d+\z/) {
+                        if ($dn =~ /\A[0-9]+\z/) {
                                 my $tmpl = "$dn-XXXXXXXX";
                                 my $dst = tempdir($tmpl, DIR => $old);
                                 same_fs_or_die($old, $dst);
@@ -200,7 +200,7 @@ sub progress_pfx ($) {
         my @p = split('/', $_[0]);
 
         # return "xap15/0" for v2, or "xapian15" for v1:
-        ($p[-1] =~ /\A\d+\z/) ? "$p[-2]/$p[-1]" : $p[-1];
+        ($p[-1] =~ /\A[0-9]+\z/) ? "$p[-2]/$p[-1]" : $p[-1];
 }
 
 # xapian-compact wrapper
@@ -276,7 +276,7 @@ sub cpdb ($$) {
                         $dst->set_metadata('last_commit', $lc) if $lc;
 
                         # only the first xapian partition (0) gets 'indexlevel'
-                        if ($old =~ m!(?:xapian\d+|xap\d+/0)\z!) {
+                        if ($old =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\z!) {
                                 my $l = $src->get_metadata('indexlevel');
                                 if ($l eq 'medium') {
                                         $dst->set_metadata('indexlevel', $l);