From 42bff9f4584362f2084033795896c2e891274631 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 1 Feb 2022 13:49:11 -0500 Subject: QPDFJob: let initializeFromArgv just take argv, not argc Let argv be a null-terminated array. There is already code that assumes this, and it makes it easier to construct the arguments. --- libqpdf/QPDFJob_argv.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libqpdf/QPDFJob_argv.cc') diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index e2870309..e3d4a47b 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -465,13 +465,18 @@ ArgParser::parseOptions() } void -QPDFJob::initializeFromArgv(int argc, char const* const argv[], +QPDFJob::initializeFromArgv(char const* const argv[], char const* progname_env) { if (progname_env == nullptr) { progname_env = "QPDF_EXECUTABLE"; } + int argc = 0; + for (auto k = argv; *k; ++k) + { + ++argc; + } QPDFArgParser qap(argc, argv, progname_env); setMessagePrefix(qap.getProgname()); ArgParser ap(qap, config()); -- cgit v1.2.3-54-g00ecf