From 820a3f04fd4cd967e3831baa835b4b177929f4d3 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 18 Mar 2022 18:22:54 -0400 Subject: Remove "lt-" workarounds The executables that libtool built invoked the underlying binary with an "lt-" prefix. The code contained numerous workarounds for testing, which can now be removed. --- examples/pdf-attach-file.cc | 6 ------ examples/pdf-bookmarks.cc | 6 ------ examples/pdf-count-strings.cc | 6 ------ examples/pdf-create.cc | 5 ----- examples/pdf-custom-filter.cc | 6 ------ examples/pdf-double-page-size.cc | 6 ------ examples/pdf-filter-tokens.cc | 6 ------ examples/pdf-invert-images.cc | 6 ------ examples/pdf-mod-info.cc | 6 ------ examples/pdf-name-number-tree.cc | 6 ------ examples/pdf-npages.cc | 6 ------ examples/pdf-overlay-page.cc | 6 ------ examples/pdf-parse-content.cc | 6 ------ examples/pdf-set-form-values.cc | 6 ------ examples/pdf-split-pages.cc | 5 ----- examples/qpdf-job.cc | 6 ------ libqpdf/QPDFArgParser.cc | 8 +------- qpdf/pdf_from_scratch.cc | 5 ----- qpdf/qpdf.cc | 6 ------ qpdf/test_driver.cc | 5 ----- qpdf/test_large_file.cc | 5 ----- qpdf/test_pdf_doc_encoding.cc | 5 ----- qpdf/test_pdf_unicode.cc | 5 ----- qpdf/test_tokenizer.cc | 5 ----- zlib-flate/zlib-flate.cc | 5 ----- 25 files changed, 1 insertion(+), 142 deletions(-) diff --git a/examples/pdf-attach-file.cc b/examples/pdf-attach-file.cc index af1e5267..2cc30262 100644 --- a/examples/pdf-attach-file.cc +++ b/examples/pdf-attach-file.cc @@ -155,12 +155,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - char const* infilename = 0; char const* password = 0; char const* attachment = 0; diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc index 1212b86d..e049e423 100644 --- a/examples/pdf-bookmarks.cc +++ b/examples/pdf-bookmarks.cc @@ -157,12 +157,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if ((argc == 2) && (strcmp(argv[1], "--version") == 0)) { std::cout << whoami << " version 1.5" << std::endl; diff --git a/examples/pdf-count-strings.cc b/examples/pdf-count-strings.cc index 4c21bc58..4a1a8e4e 100644 --- a/examples/pdf-count-strings.cc +++ b/examples/pdf-count-strings.cc @@ -75,12 +75,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 2) { usage(); diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc index f4438eab..b5d87618 100644 --- a/examples/pdf-create.cc +++ b/examples/pdf-create.cc @@ -409,11 +409,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if (argc != 2) { usage(); diff --git a/examples/pdf-custom-filter.cc b/examples/pdf-custom-filter.cc index ad4189a3..b986cfcc 100644 --- a/examples/pdf-custom-filter.cc +++ b/examples/pdf-custom-filter.cc @@ -470,12 +470,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - char const* infilename = 0; char const* outfilename = 0; bool decode_specialized = false; diff --git a/examples/pdf-double-page-size.cc b/examples/pdf-double-page-size.cc index 8f29aad4..a2f79301 100644 --- a/examples/pdf-double-page-size.cc +++ b/examples/pdf-double-page-size.cc @@ -49,12 +49,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - // For test suite bool static_id = false; if ((argc > 1) && (strcmp(argv[1], " --static-id") == 0)) diff --git a/examples/pdf-filter-tokens.cc b/examples/pdf-filter-tokens.cc index b71857e3..02c3829e 100644 --- a/examples/pdf-filter-tokens.cc +++ b/examples/pdf-filter-tokens.cc @@ -192,12 +192,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 3) { usage(); diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index 178cde95..def1dd19 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -109,12 +109,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - // For test suite bool static_id = false; if ((argc > 1) && (strcmp(argv[1], " --static-id") == 0)) diff --git a/examples/pdf-mod-info.cc b/examples/pdf-mod-info.cc index 6067fcfe..4ee4cdd0 100644 --- a/examples/pdf-mod-info.cc +++ b/examples/pdf-mod-info.cc @@ -75,12 +75,6 @@ int main(int argc, char* argv[]) whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if ((argc == 2) && (! strcmp(argv[1], "--version")) ) { std::cout << whoami << " version " << version << std::endl; diff --git a/examples/pdf-name-number-tree.cc b/examples/pdf-name-number-tree.cc index 2f16b5f0..d8bb233e 100644 --- a/examples/pdf-name-number-tree.cc +++ b/examples/pdf-name-number-tree.cc @@ -21,12 +21,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 2) { usage(); diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc index d39c6434..93378c71 100644 --- a/examples/pdf-npages.cc +++ b/examples/pdf-npages.cc @@ -18,12 +18,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if ((argc == 2) && (strcmp(argv[1], "--version") == 0)) { std::cout << whoami << " version 1.3" << std::endl; diff --git a/examples/pdf-overlay-page.cc b/examples/pdf-overlay-page.cc index def047c5..5d5468f1 100644 --- a/examples/pdf-overlay-page.cc +++ b/examples/pdf-overlay-page.cc @@ -88,12 +88,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 4) { usage(); diff --git a/examples/pdf-parse-content.cc b/examples/pdf-parse-content.cc index 89460e18..dbe3a451 100644 --- a/examples/pdf-parse-content.cc +++ b/examples/pdf-parse-content.cc @@ -63,12 +63,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 3) { usage(); diff --git a/examples/pdf-set-form-values.cc b/examples/pdf-set-form-values.cc index ddd3b2dd..eab24e4f 100644 --- a/examples/pdf-set-form-values.cc +++ b/examples/pdf-set-form-values.cc @@ -24,12 +24,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 4) { usage(); diff --git a/examples/pdf-split-pages.cc b/examples/pdf-split-pages.cc index 381480ef..c79177ee 100644 --- a/examples/pdf-split-pages.cc +++ b/examples/pdf-split-pages.cc @@ -59,11 +59,6 @@ int main(int argc, char* argv[]) { char const* whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } // For test suite if ((argc > 1) && (strcmp(argv[1], " --static-id") == 0)) { diff --git a/examples/qpdf-job.cc b/examples/qpdf-job.cc index f3905e0d..ecebca3b 100644 --- a/examples/qpdf-job.cc +++ b/examples/qpdf-job.cc @@ -27,12 +27,6 @@ int main(int argc, char* argv[]) { whoami = QUtil::getWhoami(argv[0]); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - if (argc != 1) { usage(); diff --git a/libqpdf/QPDFArgParser.cc b/libqpdf/QPDFArgParser.cc index 868db709..05e7a50e 100644 --- a/libqpdf/QPDFArgParser.cc +++ b/libqpdf/QPDFArgParser.cc @@ -21,13 +21,7 @@ QPDFArgParser::Members::Members( final_check_handler(nullptr) { auto tmp = QUtil::make_unique_cstr(argv[0]); - char* p = QUtil::getWhoami(tmp.get()); - // Remove prefix added by libtool for consistency during testing. - if (strncmp(p, "lt-", 3) == 0) - { - p += 3; - } - whoami = p; + whoami = QUtil::getWhoami(tmp.get()); } QPDFArgParser::QPDFArgParser(int argc, char const* const argv[], diff --git a/qpdf/pdf_from_scratch.cc b/qpdf/pdf_from_scratch.cc index 0dd5bbf7..10f57c38 100644 --- a/qpdf/pdf_from_scratch.cc +++ b/qpdf/pdf_from_scratch.cc @@ -94,11 +94,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if (argc != 2) { diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index 6e4be1ba..5e47327b 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -33,12 +33,6 @@ int realmain(int argc, char* argv[]) whoami = QUtil::getWhoami(argv[0]); QUtil::setLineBuf(stdout); - // Remove prefix added by libtool for consistency during testing. - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } - QPDFJob j; try { diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index fd0733fc..46916e15 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -3495,11 +3495,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if ((argc < 3) || (argc > 4)) { diff --git a/qpdf/test_large_file.cc b/qpdf/test_large_file.cc index e403dd51..8f7f8755 100644 --- a/qpdf/test_large_file.cc +++ b/qpdf/test_large_file.cc @@ -306,11 +306,6 @@ int main(int argc, char* argv[]) whoami = QUtil::getWhoami(argv[0]); QUtil::setLineBuf(stdout); - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if (argc != 4) { usage(); diff --git a/qpdf/test_pdf_doc_encoding.cc b/qpdf/test_pdf_doc_encoding.cc index 2e7103f8..c29b2d94 100644 --- a/qpdf/test_pdf_doc_encoding.cc +++ b/qpdf/test_pdf_doc_encoding.cc @@ -22,11 +22,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if (argc != 2) { diff --git a/qpdf/test_pdf_unicode.cc b/qpdf/test_pdf_unicode.cc index 8765cc3f..8964e8a5 100644 --- a/qpdf/test_pdf_unicode.cc +++ b/qpdf/test_pdf_unicode.cc @@ -22,11 +22,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if (argc != 2) { diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc index 33fb160c..b7eae323 100644 --- a/qpdf/test_tokenizer.cc +++ b/qpdf/test_tokenizer.cc @@ -260,11 +260,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } char const* filename = 0; size_t max_len = 0; diff --git a/zlib-flate/zlib-flate.cc b/zlib-flate/zlib-flate.cc index d4809dc5..57bec46a 100644 --- a/zlib-flate/zlib-flate.cc +++ b/zlib-flate/zlib-flate.cc @@ -34,11 +34,6 @@ int main(int argc, char* argv[]) { ++whoami; } - // For libtool's sake.... - if (strncmp(whoami, "lt-", 3) == 0) - { - whoami += 3; - } if ((argc == 2) && (strcmp(argv[1], "--version") == 0)) { -- cgit v1.2.3-54-g00ecf