projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings on $BRANCH
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index b31eacdfe111942ded8607bc9759d85e1179a56c..27b547002548448b5d79b874e78a93e1b65a939f 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-21,7
+21,7
@@
use strict;
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /
\d+\.\d+\.(\d+)\.(\d+)
/ || (0,0));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /
^\d+\.\d+(?:\.(\d+)\.(\d+))?$
/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::build += $VERSION;
$main::branch += $BRANCH;
@@
-68,12
+68,12
@@
sub pc12
{
my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
my $hops = get_hops(12);
{
my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
my $hops = get_hops(12);
- $origin ||= $main::mycall;
- $sysop ||= ' ';
$text ||= ' ';
$text ||= ' ';
- $wx ||= '0';
- $tonode ||= '*';
$text =~ s/\^/%5E/g;
$text =~ s/\^/%5E/g;
+ $tonode ||= '*';
+ $sysop ||= ' ';
+ $wx ||= '0';
+ $origin ||= $main::mycall;
return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
}
return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
}
@@
-123,7
+123,8
@@
sub pc17
# Request init string
sub pc18
{
# Request init string
sub pc18
{
- return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+ my $v = $DXProt::myprot_version + $main::version;
+ return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
}
#
}
#