You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2007/02/04 20:38:16 UTC
svn commit: r503459 -
/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm
Author: felicity
Date: Sun Feb 4 11:38:16 2007
New Revision: 503459
URL: http://svn.apache.org/viewvc?view=rev&rev=503459
Log:
bug 5261: fix uninitialized value warning in sa-learn --progress
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm?view=diff&rev=503459&r1=503458&r2=503459
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util/Progress.pm Sun Feb 4 11:38:16 2007
@@ -150,17 +150,19 @@
}
# only viable on Unix based OS, so exclude windows, etc here
- if (!defined($term_size) && $^O !~ /^(mswin|dos|os2)/oi) {
- my $data = `stty -a`;
- if ($data =~ /columns (\d+)/) {
- $term_size = $1;
+ if ($^O !~ /^(mswin|dos|os2)/i) {
+ if (!defined $term_size) {
+ my $data = `stty -a`;
+ if (defined $data && $data =~ /columns (\d+)/) {
+ $term_size = $1;
+ }
}
- }
- # only viable on Unix based OS, so exclude windows, etc here
- if (!defined($term_size) && $^O !~ /^(mswin|dos|os2)/oi) {
- my $data = `tput cols`;
- if ($data =~ /^(\d+)/) {
- $term_size = $1;
+
+ if (!defined $term_size) {
+ my $data = `tput cols`;
+ if (defined $data && $data =~ /^(\d+)/) {
+ $term_size = $1;
+ }
}
}