From: minima <minima>
Date: Sun, 5 Jan 2003 18:44:13 +0000 (+0000)
Subject: fix sh/c
X-Git-Tag: PRE-1-52~98
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=244e520095fef24472ae52781b3ba06577a3e5d4;p=spider.git

fix sh/c
move GN from GJ to GI
fix sh/ver permanently
---

diff --git a/Changes b/Changes
index 430db59a..9e32e7ae 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+05Jan03=======================================================================
+1. fix some irritating messages caused by protocol loops in sh/c
+2. update copyright
+3. move GN from GJ to GI
 31Dec02=======================================================================
 1. Update files in the java client with fixes and additions from Rene, OZ1LQH
 05Dec02=======================================================================
diff --git a/cmd/show/users.pl b/cmd/show/users.pl
index d197727b..f1aa6ca6 100644
--- a/cmd/show/users.pl
+++ b/cmd/show/users.pl
@@ -49,6 +49,7 @@ if (@list) {
 		push @l, $s;
 		$i++;
 	}
+	push @l, "" while $i++ < 5;
 	push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
 }
 
diff --git a/cmd/show/version.pl b/cmd/show/version.pl
index 36d4464b..f8066d8b 100644
--- a/cmd/show/version.pl
+++ b/cmd/show/version.pl
@@ -7,8 +7,9 @@
 #
 
 my @out;
-
+my ($year) = (gmtime($main::systime))[5];
+$year += 1900;
 push @out, "DX Spider Cluster version $main::version (build $main::build) on \u$^O";
-push @out, "Copyright (c) 1998-2002 Dirk Koopman G1TLH";
+push @out, "Copyright (c) 1998-$year Dirk Koopman G1TLH";
 
 return (1, @out);
diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index e0c3c55e..b2db4115 100644
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -1066,7 +1066,7 @@
   'GI' => '126',
   'GJ' => '127',
   'GM' => '128',
-  'GN' => '129',
+  'GN' => '126',
   'GP' => '129',
   'GS' => '128',
   'GT' => '125',
diff --git a/data/wpxloc.raw b/data/wpxloc.raw
index a55ab478..7deab366 100644
--- a/data/wpxloc.raw
+++ b/data/wpxloc.raw
@@ -291,6 +291,7 @@ MO6,MQ6,MR6,MT,MV6,MY6,MZ6 Isle-of-Man-GD        62 27 14  0.0 54 0 0 N 4 30 0 W
 2A6,2B6,2C6,2D6,2E6,2F6,2G6,2H6,2I6,2J6,2K6,2L6,2M6 Isle-of-Man-GD 62 27 14  0.0 54 0 0 N 4 30 0 W
 2N6,2O6,2P6,2Q6,2R6,2S6,2T6,2U6,2V6,2W6,2X6,2Y6,2Z6 Isle-of-Man-GD 62 27 14  0.0 54 0 0 N 4 30 0 W
 GI Northern-Ireland-GI                 63 27 14  0.0 54 36 0 N 5 54 0 W @
+GN Northern-Ireland-GI                 63 27 14  0.0 54 36 0 N 5 54 0 W 
 MA5,MB5,ME5,MF5,MG5,MI,MK5,ML5 Northern-Ireland-GI    63 27 14 0.0 54 36 0 N 5 54 0 W
 MN,MO5,MQ5,MR5,MV5,MY5,MZ5 Northern-Ireland-GI        63 27 14 0.0 54 36 0 N 5 54 0 W
 2A5,2B5,2C5,2D5,2E5,2F5,2G5,2H5,2I5,2J5,2K5,2L5,2M5 Northern-Ireland-GI   63 27 14  0.0 54 36 0 N 5 54 0 W
@@ -308,7 +309,6 @@ MO3,MQ3,MR3,MS,MV3,MY3,MZ3 Scotland-GM                65 27 14  0.0 55 48 0 N 4
 2A3,2B3,2C3,2D3,2E3,2F3,2G3,2H3,2I3,2J3,2K3,2L3,2M3 Scotland-GM   65 27 14  0.0 55 48 0 N 4 18 0 W
 2N3,2O3,2P3,2Q3,2R3,2S3,2T3,2U3,2V3,2W3,2X3,2Y3,2Z3 Scotland-GM   65 27 14  0.0 55 48 0 N 4 18 0 W
 GU Guernsey-GU                         66 27 14  0.0 49 30 0 N 2 42 0 W @
-GN,GP Guernsey-GU                      66 27 14  0.0 49 30 0 N 2 42 0 W
 MA8,MB8,ME8,MF8,MG8,MK8,ML8 Guernsey-GU               66 27 14  0.0 49 30 0 N 2 42 0 W
 MO8,MQ8,MR8,MU,MV8,MY8,MZ8 Guernsey-GU                66 27 14  0.0 49 30 0 N 2 42 0 W
 2A8,2B8,2C8,2D8,2E8,2F8,2G8,2H8,2I8,2J8,2K8,2L8,2M8 Guernsey-GU    66 27 14  0.0 49 30 0 N 2 42 0 W