IO encoding

diff --git a/botm-common b/botm-common
index c4843959c15d793dca50517c28dee25ddecbe275..b443d985fea32c8971cf6ffe5e2821119598d823 160000 (submodule)
--- a/botm-common
+++ b/botm-common
@@ -1 +1 @@
-Subproject commit c4843959c15d793dca50517c28dee25ddecbe275
+Subproject commit b443d985fea32c8971cf6ffe5e2821119598d823

diff --git a/sendpost.1.pl b/sendpost.1.pl
index c8578491619cbf2c4b66f0a399bcd69d7653634d..510821885c8a1b6b6e6786415f55a1f2418eaff3 100644 (file)
--- a/sendpost.1.pl
+++ b/sendpost.1.pl
@@ -18,7 +18,8 @@
 use strict;
 use utf8;
 use Getopt::Long;
-use Encode qw(encode decode);
+use Encode::Locale ('decode_argv');
+use Encode ('encode', 'decode');
 
 ###PERL_LIB: use lib '/botm/lib/post';
 use botm_common (
@@ -27,10 +28,7 @@ use botm_common (
        'make_temp_path'
 );
 
-###PERL_ENCODING_FILE_IN:  use constant ENCODING_FILE_IN  => 'UTF-8';
-###PERL_ENCODING_FILE_OUT: use constant ENCODING_FILE_OUT => 'utf8';
-###PERL_ENCODING_STD_IN:   use constant ENCODING_STD_IN   => 'UTF-8';
-###PERL_ENCODING_STD_OUT:  use constant ENCODING_STD_OUT  => 'utf8';
+###PERL_ENCODING_FILE:  use constant ENCODING_FILE  => 'UTF-8';
 
 ###PERL_DEFAULT_PASSWORD: use constant DEFAULT_PASSWORD => 'password';
 ###PERL_DEFAULT_SUBJECT:  use constant DEFAULT_SUBJECT  => 'Re: 1190: "Time"';
@@ -67,17 +65,13 @@ use constant HELP_TEXT =>
        "\n".
        "  -h,  --help\n";
 
-binmode STDIN,  ':encoding('.ENCODING_STD_IN.')';
-# binmode ARGV,   ':encoding('.ENCODING_STD_IN.')'; # not working
-binmode STDOUT, ':encoding('.ENCODING_STD_OUT.')';
-binmode STDERR, ':encoding('.ENCODING_STD_OUT.')';
+binmode STDIN,  ':encoding(console_in)';
+binmode STDOUT, ':encoding(console_out)';
+binmode STDERR, ':encoding(console_out)';
+decode_argv();
 
 my %options = {};
 
-foreach my $arg (@ARGV) {
-       $arg = decode(ENCODING_STD_IN, $arg);
-}
-
 Getopt::Long::Configure('bundling');
 GetOptions (
        'username|l=s'   => \$options{'username'},
@@ -124,7 +118,7 @@ if ((scalar @ARGV) == 0) {
 
 foreach my $arg (@ARGV) {
        # print "\nFILE $arg\n";
-       my %data = read_data_file($arg, ENCODING_FILE_IN, $options{'data-only'});
+       my %data = read_data_file($arg, ENCODING_FILE, $options{'data-only'});
        # foreach my $ind (keys %data) {
                # print $ind.'='.$data{$ind}."\n";
        # }

diff --git a/settings-debug.txt b/settings-debug.txt
index 42b934504417cb17b49803c8e3fd9507e000b52a..bc2ba565f61cb7e069367aab5fd6f8a6e5f00bf2 100644 (file)
--- a/settings-debug.txt
+++ b/settings-debug.txt
@@ -13,10 +13,7 @@ tmp_path: /botm/tmp/test-post
 
 mirror_url: http://1190.botcastle1b/ott
 
-encoding_file_in: UTF-8
-encoding_file_out: utf8
-encoding_std_in: UTF-8
-encoding_std_out: utf8
+encoding_file: UTF-8
 
 default_subject: Re: 1190: "Time"
 default_username: _

diff --git a/settings-release.txt b/settings-release.txt
index cfdb6cf56dcefceaf109d102f4b50943e10cbaec..aeeb7fe7fb85752f7644df3a70157dffbcefa087 100644 (file)
--- a/settings-release.txt
+++ b/settings-release.txt
@@ -13,10 +13,7 @@ tmp_path: /botm/tmp/post
 
 mirror_url: https://1190.bicyclesonthemoon.info/ott
 
-encoding_file_in: UTF-8
-encoding_file_out: utf8
-encoding_std_in: UTF-8
-encoding_std_out: utf8
+encoding_file: UTF-8
 
 default_subject: Re: 1190: "Time"
 default_username: _

diff --git a/settings.txt b/settings.txt
index 42c656a7fd624f89cd7df3101b721be001d2004b..8cd1625461f45137cec61f23f3b94a9032a4cc2f 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -38,10 +38,7 @@ MAKE_TMP_PATH = TMP_PATH = $tmp_path
 PERL_DEFAULT_PASSWORD  = @_PERL_CONSTANT_STR( DEFAULT_PASSWORD , $default_password)
 PERL_DEFAULT_SUBJECT   = @_PERL_CONSTANT_STR( DEFAULT_SUBJECT  , $default_subject)
 PERL_DEFAULT_USERNAME  = @_PERL_CONSTANT_STR( DEFAULT_USERNAME , $default_username)
-PERL_ENCODING_FILE_IN  = @_PERL_CONSTANT_STR( ENCODING_FILE_IN , $encoding_file_in)
-PERL_ENCODING_FILE_OUT = @_PERL_CONSTANT_STR( ENCODING_FILE_OUT, $encoding_file_out)
-PERL_ENCODING_STD_IN   = @_PERL_CONSTANT_STR( ENCODING_STD_IN  , $encoding_std_in)
-PERL_ENCODING_STD_OUT  = @_PERL_CONSTANT_STR( ENCODING_STD_OUT , $encoding_std_out)
+PERL_ENCODING_FILE     = @_PERL_CONSTANT_STR( ENCODING_FILE    , $encoding_file)
 PERL_MIRROR_URL        = @_PERL_CONSTANT_STR( MIRROR_URL       , $mirror_url)
 PERL_TMP_PATH          = @_PERL_CONSTANT_STR( TMP_PATH         , $tmp_path)