diff --git a/INSTALL.im b/INSTALL.im index f951619..84dab51 100644 --- a/INSTALL.im +++ b/INSTALL.im @@ -1,3 +1,5 @@ +#include "c++std" + // The name of the project: #define PROJECT "ssh-cron" @@ -11,7 +13,8 @@ #define CXX "g++" // the compiler options to use. -#define CXXFLAGS "--std=c++2a -pthread -Wall -O2 -fdiagnostics-color=never" +#define CXXFLAGS ${CPPSTD} " -Wall -Werror -O2 -pthread "\ + "-fdiagnostics-color=never" // flags passed to the linker #define LDFLAGS "" diff --git a/VERSION b/VERSION index 89bcfc9..6069dd8 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ #define AUTHOR "Frank B. Brokken (f.b.brokken@rug.nl)"; -#define VERSION "1.03.01" -#define YEARS "2014-2021" +#define VERSION "1.04.00" +#define YEARS "2014-2022" diff --git a/build b/build index 3511196..4730b53 100755 --- a/build +++ b/build @@ -94,7 +94,7 @@ exit(0); } - if (option == "oxref") + if (option == "xref") { precompileHeaders(); system("icmbuild program " + strip); @@ -114,7 +114,7 @@ " man - build the man-page (requires Yodl)\n" " program [strip] - build " PROJECT " (optionally strip the\n" " executable)\n" - " oxref [strip] - same a `program', also builds xref file\n" + " xref [strip] - same a `program', also builds xref file\n" " using oxref\n" " install selection [base] - to install the software in the \n" " locations defined in the INSTALL.im file,\n" diff --git a/c++std b/c++std new file mode 100644 index 0000000..6933ec8 --- /dev/null +++ b/c++std @@ -0,0 +1,2 @@ +#define CPPSTD "--std=c++20" + diff --git a/changelog b/changelog index 0b728f2..b1079d3 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,16 @@ +ssh-cron (1.04.00) + + * Ready for libbobcat6 + + * Added 'c++std' defining the c++ standard to use for + compilation. Compilation commands also use -Werror + + * Renamed the 'oxref' option in the 'build' script to 'xref' + + * Repaired warning-based errors. + + -- Frank B. Brokken Sat, 17 Sep 2022 11:16:52 +0200 + ssh-cron (1.03.01) * Removed -q from ssh-cron's build script diff --git a/cron/hmac.cc b/cron/hmac.cc index 777979c..c4f6d10 100644 --- a/cron/hmac.cc +++ b/cron/hmac.cc @@ -2,7 +2,7 @@ string Cron::hmac(string const &passPhrase) { - HMacBuf hmacbuf(passPhrase, "sha256"); + HMacBuf hmacbuf(passPhrase, "sha256", 1024); ostream out(&hmacbuf); out << passPhrase << eoi; diff --git a/daemon/createipcfile.cc b/daemon/createipcfile.cc index 2d25e8d..3043208 100644 --- a/daemon/createipcfile.cc +++ b/daemon/createipcfile.cc @@ -6,7 +6,7 @@ { string const &ipcFile = d_options.ipcFile(); - unique_ptr buffer(new char[ipcFile.length() + 6 + 1]); + unique_ptr buffer(new char[ipcFile.length() + 6 + 1]); strcpy(buffer.get() + ipcFile.copy(buffer.get(), string::npos), "XXXXXX"); int fd = mkstemp(buffer.get()); diff --git a/ssh-cron.xref b/ssh-cron.xref index 6deafa2..a005321 100644 --- a/ssh-cron.xref +++ b/ssh-cron.xref @@ -1,7 +1,7 @@ oxref by Frank B. Brokken (f.b.brokken@rug.nl) -oxref V2.00.00 2012-2019 - -CREATED Fri, 26 Apr 2019 13:07:58 +0000 +oxref V2.00.03 2012-2022 + +CREATED Sat, 17 Sep 2022 09:25:33 +0000 CROSS REFERENCE FOR: -fxs tmp/libmodules.a ---------------------------------------------------------------------- @@ -17,20 +17,20 @@ Full name: CronData::addName(std::__cxx11::basic_string, std::allocator > const&) Source: addname.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) addNr(unsigned long) Full name: CronData::addNr(unsigned long) Source: addnr.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) addRange(unsigned long, unsigned long, unsigned long) Full name: CronData::addRange(unsigned long, unsigned long, unsigned long) Source: addrange.cc Used By: - parse.cc: Parser::executeAction(int) setall.cc: CronData::setAll(unsigned long) + parse.cc: Parser::executeAction_(int) assign() Full name: CronData::assign() @@ -166,11 +166,11 @@ Used By: childprocess.cc: Daemon::childProcess() -error(char const*) - Full name: Parser::error(char const*) +error() + Full name: Parser::error() Source: error.cc Used By: - parse.cc: Parser::errorRecovery() + parse.cc: Parser::errorRecovery_() execute(CronEntry const&) Full name: Cron::execute(CronEntry const&) @@ -204,17 +204,6 @@ Used By: reload.cc: Cron::reload(std::istream&) getpassphrase.cc: Daemon::getPassPhrase() - -idmsg() const - Full name: Cron::idmsg() const - Source: idmsg.cc - Used By: - cronloop.cc: Cron::cronLoop() - definerunfunction.cc: Cron::defineRunFunction() - execute.cc: Cron::execute(CronEntry const&) - handlerequests.cc: Cron::handleRequests() - parentprocess.cc: Cron::parentProcess() - reload.cc: Cron::reload(std::istream&) idmsg() const Full name: Daemon::idmsg() const @@ -228,6 +217,24 @@ reload.cc: Daemon::reload() terminate.cc: Daemon::terminate() const +idmsg() const + Full name: Cron::idmsg() const + Source: idmsg.cc + Used By: + cronloop.cc: Cron::cronLoop() + definerunfunction.cc: Cron::defineRunFunction() + execute.cc: Cron::execute(CronEntry const&) + handlerequests.cc: Cron::handleRequests() + parentprocess.cc: Cron::parentProcess() + reload.cc: Cron::reload(std::istream&) + +insert(std::ostream&) const + Full name: CronData::insert(std::ostream&) const + Source: insert.cc + Used By: + parentprocess.cc: Daemon::parentProcess() + reload.cc: Daemon::reload() + insert(std::ostream&) const Full name: CronEntry::insert(std::ostream&) const Source: insert.cc @@ -235,22 +242,15 @@ operatorinsert.cc: operator<<(std::ostream&, CronEntry const&) insert.cc: CronData::insert(std::ostream&) const -insert(std::ostream&) const - Full name: CronData::insert(std::ostream&) const - Source: insert.cc - Used By: - parentprocess.cc: Daemon::parentProcess() - reload.cc: Daemon::reload() - instance() Full name: Options::instance() Source: instance.cc Used By: - cron1.cc: Cron::Cron(CronData&) - handlerequests.cc: Cron::handleRequests() addcroncommand.cc: CronData::addCronCommand() crondata1.cc: CronData::CronData() setenvvar.cc: CronData::setEnvVar(std::__cxx11::basic_string, std::allocator > const&, std::__cxx11::basic_string, std::allocator > const&) + cron1.cc: Cron::Cron(CronData&) + handlerequests.cc: Cron::handleRequests() daemon1.cc: Daemon::Daemon() getipcinfo.cc: Daemon::getIPCInfo() const parentprocess.cc: Daemon::parentProcess() @@ -267,11 +267,11 @@ Used By: run.cc: Daemon::run() -lex__() - Full name: Scanner::lex__() +lex_() + Full name: Scanner::lex_() Source: lex.cc Used By: - parse.cc: Parser::nextToken() + parse.cc: Parser::nextToken_() list(std::istream&) Full name: Daemon::list(std::istream&) @@ -301,8 +301,8 @@ Full name: operator<<(std::ostream&, CronEntry const&) Source: operatorinsert.cc Used By: + addcroncommand.cc: CronData::addCronCommand() list.cc: Cron::list(unsigned long*, long, FBB::SharedStream&) - addcroncommand.cc: CronData::addCronCommand() Options() Full name: Options::Options() @@ -347,7 +347,7 @@ Full name: CronData::process() Source: process.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) readRequest(std::istream&) Full name: Cron::readRequest(std::istream&) @@ -378,7 +378,7 @@ Full name: CronData::reset(unsigned long) Source: reset.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) runCronJobs() Full name: Cron::runCronJobs() @@ -492,25 +492,25 @@ Full name: CronData::setAll(unsigned long) Source: setall.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setCommand(std::__cxx11::basic_string, std::allocator > const&) Full name: CronData::setCommand(std::__cxx11::basic_string, std::allocator > const&) Source: setcommand.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setDayOfMonth() Full name: CronData::setDayOfMonth() Source: setdayofmonth.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setDayOfWeek() Full name: CronData::setDayOfWeek() Source: setdayofweek.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setEnvironment(unsigned long, unsigned long, std::vector, std::allocator >, std::allocator, std::allocator > > > const*) Full name: CronEntry::setEnvironment(unsigned long, unsigned long, std::vector, std::allocator >, std::allocator, std::allocator > > > const*) @@ -522,25 +522,25 @@ Full name: CronData::setEnvVar(std::__cxx11::basic_string, std::allocator > const&, std::__cxx11::basic_string, std::allocator > const&) Source: setenvvar.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setHours() Full name: CronData::setHours() Source: sethours.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setMinutes() Full name: CronData::setMinutes() Source: setminutes.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setMonthOfYear() Full name: CronData::setMonthOfYear() Source: setmonthofyear.cc Used By: - parse.cc: Parser::executeAction(int) + parse.cc: Parser::executeAction_(int) setSyslog() Full name: Options::setSyslog()