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.

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.
Jay Berkenbilt · Jay Berkenbilt
1 parent e316e90d
Showing 25 changed files with 1 additions and 142 deletions
examples/pdf-attach-file.cc
examples/pdf-bookmarks.cc
examples/pdf-count-strings.cc
examples/pdf-create.cc
examples/pdf-custom-filter.cc
examples/pdf-double-page-size.cc
examples/pdf-filter-tokens.cc
examples/pdf-invert-images.cc
examples/pdf-mod-info.cc
examples/pdf-name-number-tree.cc
examples/pdf-npages.cc
examples/pdf-overlay-page.cc
examples/pdf-parse-content.cc
examples/pdf-set-form-values.cc
examples/pdf-split-pages.cc
examples/qpdf-job.cc
libqpdf/QPDFArgParser.cc
qpdf/pdf_from_scratch.cc
qpdf/qpdf.cc
qpdf/test_driver.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;
@@ -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;
@@ -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();
@@ -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();
@@ -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;
@@ -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))
@@ -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();
@@ -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))
@@ -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;
@@ -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();
@@ -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;
@@ -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();
@@ -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();
@@ -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();
@@ -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))
     {
@@ -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();
@@ -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[],
@@ -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)
     {
@@ -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
     {
@@ -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))
     {
@@ -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();
@@ -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)
     {
@@ -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)
     {
@@ -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;
@@ -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))
     {