use temp file, when send post function

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

diff --git a/makefile b/makefile
index a9cc2c6122e7712faeea27af44739d7cab860636..187898619d9bacd0774c8fccc1d096d103e36d2e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -28,6 +28,7 @@ RM   =/usr/bin/rm
 
 BIN_PATH = /botm/bin/test-post
 LIB_PATH = /botm/lib/test-post
+TMP_PATH = /botm/tmp/test-post
 
 
 CONFIGFILE = settings-$(TARGET).txt settings.txt
@@ -46,7 +47,11 @@ sendpost
 
 DIR=\
 $(BIN_PATH)\
-$(LIB_PATH)
+$(LIB_PATH)\
+$(TMP_PATH)
+
+HIDDEN_DIR=\
+$(TMP_PATH)
 
 SETUID=
 
@@ -78,7 +83,7 @@ setuid: $(SETUID)
 
 mktree:
        $(MKDIR) -p $(DIR)
-#      $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)
+       $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)
 
 ifdef BIN_PATH
 cp_bin: $(BIN) setuid exec | mktree

diff --git a/makefile.1.mak b/makefile.1.mak
index 772aa5e4e382638b4f8cf806249dcd9448377c96..c2c6e970678b87e613835f531b5f7960ad9e5ccb 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -28,6 +28,7 @@ endif
 \r
 ###MAKE_BIN_PATH: BIN_PATH = /botm/bin/post\r
 ###MAKE_LIB_PATH: LIB_PATH = /botm/lib/post\r
+###MAKE_TMP_PATH: TMP_PATH = /botm/tmp/post\r
 \r
 \r
 CONFIGFILE = settings-$(TARGET).txt settings.txt\r
@@ -46,7 +47,11 @@ sendpost
 \r
 DIR=\\r
 $(BIN_PATH)\\r
-$(LIB_PATH)\r
+$(LIB_PATH)\\r
+$(TMP_PATH)\r
+\r
+HIDDEN_DIR=\\r
+$(TMP_PATH)\r
 \r
 SETUID=\r
 \r
@@ -78,7 +83,7 @@ setuid: $(SETUID)
 \r
 mktree:\r
        $(MKDIR) -p $(DIR)\r
-#      $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)\r
+       $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)\r
 \r
 ifdef BIN_PATH\r
 cp_bin: $(BIN) setuid exec | mktree\r

diff --git a/sendpost.1.pl b/sendpost.1.pl
index dda1ce9fff541fa212eeeb921925feb2c37bf972..c8578491619cbf2c4b66f0a399bcd69d7653634d 100644 (file)
--- a/sendpost.1.pl
+++ b/sendpost.1.pl
@@ -24,6 +24,7 @@ use Encode qw(encode decode);
 use botm_common (
        'read_data_file', 'write_data_file',
        'merge_url',
+       'make_temp_path'
 );
 
 ###PERL_ENCODING_FILE_IN:  use constant ENCODING_FILE_IN  => 'UTF-8';
@@ -35,6 +36,8 @@ use botm_common (
 ###PERL_DEFAULT_SUBJECT:  use constant DEFAULT_SUBJECT  => 'Re: 1190: "Time"';
 ###PERL_DEFAULT_USERNAME: use constant DEFAULT_USERNAME => 'username';
 
+###PERL_TMP_PATH:   use constant TMP_PATH   => '/botm/tmp/post';
+
 ###PERL_MIRROR_URL: use constant MIRROR_URL => 'https://1190.bicyclesonthemoon.info/ott';
 
 use constant HELP_TEXT =>
@@ -111,28 +114,39 @@ if ($options{'mirror-url'} eq '') {
        $options{'mirror-url'} = MIRROR_URL;
 }
 
-post_to_mirror();
-exit 0;
 
-print "options:\n";
-my $a = write_data_file(\*STDOUT, ENCODING_STD_OUT, 0, \%options);
-print "$a\n";
+# print "OPTIONS:\n";
+# my $a = write_data_file(\*STDOUT, ENCODING_STD_OUT, 0, \%options);
 
-foreach my $arg (@ARGV) {
-       print "\nFILE $arg\n";
-       my %data = read_data_file($arg, 'utf8', 1);
-       foreach my $ind (keys %data) {
-               print $ind.'='.$data{$ind}."\n";
-       }
+if ((scalar @ARGV) == 0) {
+       @ARGV = (\*STDIN);
 }
-# if ((scalar @ARGV) == 0) {
-       # print "\nSTDIN\n";
-       # my $fh;
-       # my %data = read_data_file(\*STDIN, 'utf8', 1);
+
+foreach my $arg (@ARGV) {
+       # print "\nFILE $arg\n";
+       my %data = read_data_file($arg, ENCODING_FILE_IN, $options{'data-only'});
        # foreach my $ind (keys %data) {
                # print $ind.'='.$data{$ind}."\n";
        # }
-# }
+       
+       my %post = prepare_post(\%options, \%data);
+       # foreach my $ind (keys %post) {
+               # print $ind.'='.$post{$ind}."\n";
+       # }
+       
+       # unless ($options{'mirror'}) {
+               # if (post_to_ott (\%options, \%post)) {
+                       # next;
+               # }
+       # }
+       unless ($options{'no-mirror'}) {
+               post_to_mirror(\%options, \%post);
+       }
+}
+
+
+
+
 
 sub prepare_post {
        (my $cmd_options, my $file_data) = @_;
@@ -255,8 +269,16 @@ sub prepare_post {
 
 sub post_to_mirror {
        (my $cmd_options, my $post) = @_;
-       my $post_url = merge_url($options{'mirror-url'}, 'post');
+       my $post_url = merge_url($cmd_options->{'mirror-url'}, 'post');
+       
+       my $tmp_path      = make_temp_path(TMP_PATH, 'sendpost.htm');
+       my $cookie_path   = make_temp_path(TMP_PATH, 'sendpost.cookie.txt');
+       my $postdata_path = make_temp_path(TMP_PATH, 'sendpost.postdata.txt');
+       
        
        print $post_url."\n";
+       print $tmp_path."\n";
+       print $cookie_path."\n";
+       print $postdata_path."\n";
        
 }

diff --git a/settings-debug.txt b/settings-debug.txt
index 38f43eb216f8942d83ac6c3e2543555c3fa99e86..42b934504417cb17b49803c8e3fd9507e000b52a 100644 (file)
--- a/settings-debug.txt
+++ b/settings-debug.txt
@@ -9,6 +9,7 @@ configure: /botm/bin/config/configure.pl
 
 bin_path: /botm/bin/test-post
 lib_path: /botm/lib/test-post
+tmp_path: /botm/tmp/test-post
 
 mirror_url: http://1190.botcastle1b/ott
 

diff --git a/settings-release.txt b/settings-release.txt
index 456017bb16aafd014f18e5f1b7a9ea4f7d8f3125..cfdb6cf56dcefceaf109d102f4b50943e10cbaec 100644 (file)
--- a/settings-release.txt
+++ b/settings-release.txt
@@ -9,6 +9,7 @@ configure: /botm/bin/config/configure.pl
 
 bin_path: /botm/bin/post
 lib_path: /botm/lib/post
+tmp_path: /botm/tmp/post
 
 mirror_url: https://1190.bicyclesonthemoon.info/ott
 
@@ -21,6 +22,7 @@ default_subject: Re: 1190: "Time"
 default_username: _
 default_password: _
 
+
 cp: /usr/bin/cp
 chmod: /usr/bin/chmod
 mkdir: /usr/bin/mkdir

diff --git a/settings.txt b/settings.txt
index df9c303118c56d23eaad0793a6d8d182e9e0c688..42c656a7fd624f89cd7df3101b721be001d2004b 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -32,6 +32,7 @@ MAKE_RM     = RM   =$rm
 
 MAKE_BIN_PATH = BIN_PATH = $bin_path
 MAKE_LIB_PATH = LIB_PATH = $lib_path
+MAKE_TMP_PATH = TMP_PATH = $tmp_path
 
 
 PERL_DEFAULT_PASSWORD  = @_PERL_CONSTANT_STR( DEFAULT_PASSWORD , $default_password)
@@ -41,9 +42,10 @@ PERL_ENCODING_FILE_IN  = @_PERL_CONSTANT_STR( ENCODING_FILE_IN , $encoding_file_
 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_MIRROR_URL        = @_PERL_CONSTANT_STR( MIRROR_URL       , $mirror_url);
+PERL_MIRROR_URL        = @_PERL_CONSTANT_STR( MIRROR_URL       , $mirror_url)
+PERL_TMP_PATH          = @_PERL_CONSTANT_STR( TMP_PATH         , $tmp_path)
 
-PERL_LIB = @_PERL_USE_2(lib, '$lib_path')
+PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path))
 
 
 RUN_PERL = @_SHEBANG($perl)
\ No newline at end of file