Correct 12m band CW segment definition

add badw_regex.es.issue for those Spanish words we don't like
changed the name of the English version to badw_regex.gb.issue
allow DELETE (0x7f) character for backspace in console.pl

diff --git a/Changes b/Changes
index 399057083e5d6ea1c06ccca0537eccb6ae32db09..e3bb3a9922a344bd54bc7ff2033fccaaec52c70e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+19Oct01=======================================================================
+1. Allow DELETE (0x7f) for backspace in console.pl
 14Oct01=======================================================================
 1. Add the shortform SH/ST like display to sh/user <call> to make it more
 AK1A compatible (G0RDI+G4PDQ pace).

diff --git a/data/badw_regex.es.issue b/data/badw_regex.es.issue
new file mode 100644 (file)
index 0000000..02f5c0e
--- /dev/null
+++ b/data/badw_regex.es.issue
@@ -0,0 +1,14 @@
+#
+# ES badwords regex file
+#
+m0ro mor0 m0r0
+f0lla
+p0ya p0lla
+mierda m1erda
+jodan j0dan jode j0de jodete j0ete
+cabron cabr0n
+puta
+hijoputa h1joputa h1j0puta
+cojones c0jones coj0nes c0j0nes
+cornudo cornupeta c0rnudo cornud0 c0rnud0
+co¤o

diff --git a/data/badw_regex.gb.issue b/data/badw_regex.gb.issue
new file mode 100644 (file)
index 0000000..e38b4c8
--- /dev/null
+++ b/data/badw_regex.gb.issue
@@ -0,0 +1,22 @@
+# this is the bad regex issue file
+# BE VERY CAREFUL ADDING WORDS TO THIS
+# as it will find them in all sorts of combinations
+# eg 'fuck' 'ffuck' 'fffuuucckk' 'f    u...c  kkkk' 'youf u c.. ker'
+fuck
+cunt
+cock c0ck
+wank
+shit sh1t
+piss p1ss
+bolock b0lock b0l0ck
+toser t0ser
+tospot t0spot t0sp0t
+arse
+plonker pl0nker
+ashole ash0le
+arsehole arseh0le
+buger
+jihad j1had
+alah
+raghead
+muslim muls1m

diff --git a/data/badw_regex.issue b/data/badw_regex.issue
deleted file mode 100644 (file)
index e38b4c8..0000000
--- a/data/badw_regex.issue
+++ /dev/null
@@ -1,22 +0,0 @@
-# this is the bad regex issue file
-# BE VERY CAREFUL ADDING WORDS TO THIS
-# as it will find them in all sorts of combinations
-# eg 'fuck' 'ffuck' 'fffuuucckk' 'f    u...c  kkkk' 'youf u c.. ker'
-fuck
-cunt
-cock c0ck
-wank
-shit sh1t
-piss p1ss
-bolock b0lock b0l0ck
-toser t0ser
-tospot t0spot t0sp0t
-arse
-plonker pl0nker
-ashole ash0le
-arsehole arseh0le
-buger
-jihad j1had
-alah
-raghead
-muslim muls1m

diff --git a/data/bands.pl b/data/bands.pl
index 1068928262ceff77702c59bdf80794bb0fd3a382..dbac0c5d9b83b95e0516fc5461234fe3332884fc 100644 (file)
--- a/data/bands.pl
+++ b/data/bands.pl
@@ -74,7 +74,7 @@
                   }, 'Bands'),
 
   '12m' => bless( { band => [ 24890, 24990 ], 
-                    cw => [ 24890, 24990 ], 
+                    cw => [ 24890, 24930 ], 
                     ssb => [ 24931, 24990], 
                     rtty => [ 24920, 24929], 
                     data => [ 24920, 24929], 

diff --git a/perl/BadWords.pm b/perl/BadWords.pm
index 05e764fce9906f928dff56440fa83cf117a7d3c5..7ae0373f436f007edcd259af76b2699f3f210a6d 100644 (file)
--- a/perl/BadWords.pm
+++ b/perl/BadWords.pm
@@ -24,7 +24,7 @@ my $regex = "$main::data/badw_regex";
 my $bwfn = "$main::data/badword";
 
 # copy issue ones across
-filecopy("$regex.issue", $regex) unless -e $regex;
+filecopy("$regex.gb.issue", $regex) unless -e $regex;
 filecopy("$bwfn.issue", $bwfn) unless -e $bwfn;
 
 $badword = new DXHash "badword";

diff --git a/perl/console.pl b/perl/console.pl
index 0642e4b9b09240d26269c0478ca7b4ea13b425ed..4dba480b03ea56b19d60b8d68a89b382a9d6cabe 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -361,7 +361,7 @@ sub rec_stdin
                        $pos = 0;
                } elsif ($r eq KEY_END || $r eq "\005") {
                        $pos = $lth;
-               } elsif ($r eq KEY_BACKSPACE || $r eq "\010") {
+               } elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\0177") {
                        if ($pos > 0) {
                                my $a = substr($inbuf, 0, $pos-1);
                                my $b = substr($inbuf, $pos) if $pos < $lth;