From 1a562af4ea2a68df55563f1a29079c853777abb4 Mon Sep 17 00:00:00 2001 From: b Date: Sat, 9 Mar 2024 19:58:26 +0000 Subject: [PATCH] fix mistake in write_data_file call; temporarily disable addpost --- botm-common | 2 +- config | 2 +- makefile | 9 +++++---- makefile.1.mak | 9 +++++---- post_common.1.pm | 5 ++++- sendpost.1.pl | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/botm-common b/botm-common index 44fbe59..2b44cff 160000 --- a/botm-common +++ b/botm-common @@ -1 +1 @@ -Subproject commit 44fbe59bfd7652a0975e601591df4a4b218da40d +Subproject commit 2b44cff4fd1df24df3fc9d354e0848e3f0516ef3 diff --git a/config b/config index fc9affe..778dbca 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit fc9affec336a16cde93b2675a836bdd01d1c2210 +Subproject commit 778dbca76f413af0b5d2c442a482b4d4eebaf2cb diff --git a/makefile b/makefile index 27c240f..9517734 100644 --- a/makefile +++ b/makefile @@ -49,16 +49,16 @@ CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE) # keep these 2 lists in the same order!: GENERATE_FROM=\ -addpost.1.pl\ sendpost.1.pl\ preview.1.pl\ post_common.1.pm +#addpost.1.pl\ TO_GENERATE=\ -addpost.pl\ sendpost.pl\ preview.pl\ post_common.pm +#addpost.pl\ DIR=\ $(BIN_PATH)\ @@ -76,13 +76,14 @@ $(DATA_WAIT_PATH)\ $(TMP_PATH) SETUID=\ -addpost\ sendpost +#addpost\ + EXEC=\ -addpost.pl\ sendpost.pl\ preview.pl +#addpost.pl\ PERL_WRAP_EXEC=\ addpost\ diff --git a/makefile.1.mak b/makefile.1.mak index 06819d8..f7a5cfd 100644 --- a/makefile.1.mak +++ b/makefile.1.mak @@ -49,16 +49,16 @@ CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE) # keep these 2 lists in the same order!: GENERATE_FROM=\ -addpost.1.pl\ sendpost.1.pl\ preview.1.pl\ post_common.1.pm +#addpost.1.pl\ TO_GENERATE=\ -addpost.pl\ sendpost.pl\ preview.pl\ post_common.pm +#addpost.pl\ DIR=\ $(BIN_PATH)\ @@ -76,13 +76,14 @@ $(DATA_WAIT_PATH)\ $(TMP_PATH) SETUID=\ -addpost\ sendpost +#addpost\ + EXEC=\ -addpost.pl\ sendpost.pl\ preview.pl +#addpost.pl\ PERL_WRAP_EXEC=\ addpost\ diff --git a/post_common.1.pm b/post_common.1.pm index cc174f8..fc4137e 100644 --- a/post_common.1.pm +++ b/post_common.1.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Balthasar Szczepański +# Copyright (C) 2023, 2024 Balthasar Szczepański # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -13,6 +13,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +# TODO: rethink prepare_post: when to use deefault? +# TODO: get unspecified options from edit page instead of defaults + package post_common; use strict; diff --git a/sendpost.1.pl b/sendpost.1.pl index ac19a13..e07cfdc 100644 --- a/sendpost.1.pl +++ b/sendpost.1.pl @@ -344,7 +344,7 @@ sub post_to_mirror { print "PREVIOUS POST\n"; write_data_file( \*STDOUT, \%previous_post, 'console_out', - 0, 0, 0 + 0, 0, 0, '>>', 1 ); print "\n"; -- 2.30.2