OpenSystemsDevelopment / qpdf

Commit 2d5b854468c2612dcfe45a659b85d92db2672cbe

Authored by Jay Berkenbilt
1 parent 5993c3e8

Allow reading command-line args from files (fixes #16)

Inline Side-by-side
Showing 10 changed files with 152 additions and 3 deletions
ChangeLog
  View file @2d5b854
1 2017-07-29 Jay Berkenbilt <ejb@ql.org> 1 2017-07-29 Jay Berkenbilt <ejb@ql.org>
2 2
  3 + * Support @filename and @- in the qpdf command-line tool to read
  4 + command-line arguments, one per line, from the named file. @-
  5 + reads from standard input. Fixes #16.
  6 +
3 * Detect when input file and output file are the same and exit to 7 * Detect when input file and output file are the same and exit to
4 avoid overwriting and losing input file. Fixes #29. 8 avoid overwriting and losing input file. Fixes #29.
5 9
include/qpdf/QUtil.hh
  View file @2d5b854
@@ -161,6 +161,11 @@ namespace QUtil @@ -161,6 +161,11 @@ namespace QUtil
161 QPDF_DLL 161 QPDF_DLL
162 RandomDataProvider* getRandomDataProvider(); 162 RandomDataProvider* getRandomDataProvider();
163 163
  164 + QPDF_DLL
  165 + std::list<std::string> read_lines_from_file(char const* filename);
  166 + QPDF_DLL
  167 + std::list<std::string> read_lines_from_file(std::istream&);
  168 +
164 // These routines help the tokenizer recognize certain character 169 // These routines help the tokenizer recognize certain character
165 // classes without using ctype, which we avoid because of locale 170 // classes without using ctype, which we avoid because of locale
166 // considerations. 171 // considerations.
libqpdf/QUtil.cc
  View file @2d5b854
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #include <cmath> 11 #include <cmath>
12 #include <iomanip> 12 #include <iomanip>
13 #include <sstream> 13 #include <sstream>
  14 +#include <fstream>
14 #include <stdexcept> 15 #include <stdexcept>
15 #include <stdio.h> 16 #include <stdio.h>
16 #include <errno.h> 17 #include <errno.h>
@@ -566,3 +567,55 @@ QUtil::is_number(char const* p) @@ -566,3 +567,55 @@ QUtil::is_number(char const* p)
566 } 567 }
567 return found_digit; 568 return found_digit;
568 } 569 }
  570 +
  571 +std::list<std::string>
  572 +QUtil::read_lines_from_file(char const* filename)
  573 +{
  574 + std::ifstream in(filename, std::ios_base::binary);
  575 + if (! in.is_open())
  576 + {
  577 + throw_system_error(std::string("open ") + filename);
  578 + }
  579 + std::list<std::string> lines = read_lines_from_file(in);
  580 + in.close();
  581 + return lines;
  582 +}
  583 +
  584 +std::list<std::string>
  585 +QUtil::read_lines_from_file(std::istream& in)
  586 +{
  587 + std::list<std::string> result;
  588 + std::string* buf = 0;
  589 +
  590 + char c;
  591 + while (in.get(c))
  592 + {
  593 + if (buf == 0)
  594 + {
  595 + result.push_back("");
  596 + buf = &(result.back());
  597 + buf->reserve(80);
  598 + }
  599 +
  600 + if (buf->capacity() == buf->size())
  601 + {
  602 + buf->reserve(buf->capacity() * 2);
  603 + }
  604 + if (c == '\n')
  605 + {
  606 + // Remove any carriage return that preceded the
  607 + // newline and discard the newline
  608 + if ((! buf->empty()) && ((*(buf->rbegin())) == '\r'))
  609 + {
  610 + buf->erase(buf->length() - 1);
  611 + }
  612 + buf = 0;
  613 + }
  614 + else
  615 + {
  616 + buf->append(1, c);
  617 + }
  618 + }
  619 +
  620 + return result;
  621 +}
libtests/qtest/qutil/other-file
  View file @2d5b854
1 -test 1 +This file is used for qutil testing.
  2 +It has mixed newlines.
  3 +Some lines are very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long.
libtests/qtest/qutil/qutil.out
  View file @2d5b854
@@ -42,3 +42,7 @@ file1: -qutil.out-, file2: -other-file-; same: 0: PASS @@ -42,3 +42,7 @@ file1: -qutil.out-, file2: -other-file-; same: 0: PASS
42 file1: -qutil.out-, file2: --; same: 0: PASS 42 file1: -qutil.out-, file2: --; same: 0: PASS
43 file1: -qutil.out-, file2: -(null)-; same: 0: PASS 43 file1: -qutil.out-, file2: -(null)-; same: 0: PASS
44 file1: --, file2: -qutil.out-; same: 0: PASS 44 file1: --, file2: -qutil.out-; same: 0: PASS
  45 +----
  46 +This file is used for qutil testing.
  47 +It has mixed newlines.
  48 +Some lines are very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long.
libtests/qutil.cc
  View file @2d5b854
@@ -170,6 +170,16 @@ void same_file_test() @@ -170,6 +170,16 @@ void same_file_test()
170 assert_same_file("", "qutil.out", false); 170 assert_same_file("", "qutil.out", false);
171 } 171 }
172 172
  173 +void read_lines_from_file_test()
  174 +{
  175 + std::list<std::string> lines = QUtil::read_lines_from_file("other-file");
  176 + for (std::list<std::string>::iterator iter = lines.begin();
  177 + iter != lines.end(); ++iter)
  178 + {
  179 + std::cout << *iter << std::endl;
  180 + }
  181 +}
  182 +
173 int main(int argc, char* argv[]) 183 int main(int argc, char* argv[])
174 { 184 {
175 try 185 try
@@ -187,6 +197,8 @@ int main(int argc, char* argv[]) @@ -187,6 +197,8 @@ int main(int argc, char* argv[])
187 get_whoami_test(); 197 get_whoami_test();
188 std::cout << "----" << std::endl; 198 std::cout << "----" << std::endl;
189 same_file_test(); 199 same_file_test();
  200 + std::cout << "----" << std::endl;
  201 + read_lines_from_file_test();
190 } 202 }
191 catch (std::exception& e) 203 catch (std::exception& e)
192 { 204 {
manual/qpdf-manual.xml
  View file @2d5b854
@@ -255,6 +255,14 @@ make @@ -255,6 +255,14 @@ make
255 linkend="ref.page-selection"/>. 255 linkend="ref.page-selection"/>.
256 </para> 256 </para>
257 <para> 257 <para>
  258 + If <option>@filename</option> appears anywhere in the
  259 + command-line, it will be read line by line, and each line will be
  260 + treated as a command-line argument. The <option>@-</option> option
  261 + allows arguments to be read from standard input. This allows qpdf
  262 + to be invoked with an arbitrary number of arbitrarily long
  263 + arguments.
  264 + </para>
  265 + <para>
258 <option>outfilename</option> does not have to be seekable, even 266 <option>outfilename</option> does not have to be seekable, even
259 when generating linearized files. Specifying 267 when generating linearized files. Specifying
260 &ldquo;<option>--</option>&rdquo; as <option>outfilename</option> 268 &ldquo;<option>--</option>&rdquo; as <option>outfilename</option>
qpdf/qpdf.cc
  View file @2d5b854
@@ -69,6 +69,10 @@ Usage: qpdf [ options ] { infilename | --empty } [ outfilename ]\n\ @@ -69,6 +69,10 @@ Usage: qpdf [ options ] { infilename | --empty } [ outfilename ]\n\
69 \n\ 69 \n\
70 An option summary appears below. Please see the documentation for details.\n\ 70 An option summary appears below. Please see the documentation for details.\n\
71 \n\ 71 \n\
  72 +If @filename appears anywhere in the command-line, each line of filename\n\
  73 +will be interpreted as an argument. No interpolation is done. Line\n\
  74 +terminators are stripped. @- can be specified to read from standard input.\n\
  75 +\n\
72 Note that when contradictory options are provided, whichever options are\n\ 76 Note that when contradictory options are provided, whichever options are\n\
73 provided last take precedence.\n\ 77 provided last take precedence.\n\
74 \n\ 78 \n\
@@ -953,6 +957,28 @@ static void parse_version(std::string const&amp; full_version_string, @@ -953,6 +957,28 @@ static void parse_version(std::string const&amp; full_version_string,
953 version = v; 957 version = v;
954 } 958 }
955 959
  960 +static void read_args_from_file(char const* filename,
  961 + std::vector<PointerHolder<char> >& new_argv)
  962 +{
  963 + std::list<std::string> lines;
  964 + if (strcmp(filename, "-") == 0)
  965 + {
  966 + QTC::TC("qpdf", "qpdf read args from stdin");
  967 + lines = QUtil::read_lines_from_file(std::cin);
  968 + }
  969 + else
  970 + {
  971 + QTC::TC("qpdf", "qpdf read args from file");
  972 + lines = QUtil::read_lines_from_file(filename);
  973 + }
  974 + for (std::list<std::string>::iterator iter = lines.begin();
  975 + iter != lines.end(); ++iter)
  976 + {
  977 + new_argv.push_back(
  978 + PointerHolder<char>(QUtil::copy_string((*iter).c_str()), true));
  979 + }
  980 +}
  981 +
956 int main(int argc, char* argv[]) 982 int main(int argc, char* argv[])
957 { 983 {
958 whoami = QUtil::getWhoami(argv[0]); 984 whoami = QUtil::getWhoami(argv[0]);
@@ -1060,6 +1086,33 @@ int main(int argc, char* argv[]) @@ -1060,6 +1086,33 @@ int main(int argc, char* argv[])
1060 char const* infilename = 0; 1086 char const* infilename = 0;
1061 char const* outfilename = 0; 1087 char const* outfilename = 0;
1062 1088
  1089 + // Support reading arguments from files. Create a new argv. Ensure
  1090 + // that argv itself as well as all its contents are automatically
  1091 + // deleted by using PointerHolder objects to back the pointers in
  1092 + // argv.
  1093 + std::vector<PointerHolder<char> > new_argv;
  1094 + new_argv.push_back(PointerHolder<char>(QUtil::copy_string(argv[0]), true));
  1095 + for (int i = 1; i < argc; ++i)
  1096 + {
  1097 + if ((strlen(argv[i]) > 1) && (argv[i][0] == '@'))
  1098 + {
  1099 + read_args_from_file(1+argv[i], new_argv);
  1100 + }
  1101 + else
  1102 + {
  1103 + new_argv.push_back(
  1104 + PointerHolder<char>(QUtil::copy_string(argv[i]), true));
  1105 + }
  1106 + }
  1107 + PointerHolder<char*> argv_ph(new char*[1+new_argv.size()], true);
  1108 + argv = argv_ph.getPointer();
  1109 + for (size_t i = 0; i < new_argv.size(); ++i)
  1110 + {
  1111 + argv[i] = new_argv.at(i).getPointer();
  1112 + }
  1113 + argc = static_cast<int>(new_argv.size());
  1114 + argv[argc] = 0;
  1115 +
1063 for (int i = 1; i < argc; ++i) 1116 for (int i = 1; i < argc; ++i)
1064 { 1117 {
1065 char const* arg = argv[i]; 1118 char const* arg = argv[i];
qpdf/qpdf.testcov
  View file @2d5b854
@@ -285,3 +285,5 @@ QPDFObjectHandle non-stream in parsecontent 0 @@ -285,3 +285,5 @@ QPDFObjectHandle non-stream in parsecontent 0
285 QPDFObjectHandle errors in parsecontent 0 285 QPDFObjectHandle errors in parsecontent 0
286 QPDF stream with non-space 0 286 QPDF stream with non-space 0
287 qpdf same file error 0 287 qpdf same file error 0
  288 +qpdf read args from stdin 0
  289 +qpdf read args from file 0
qpdf/qtest/qpdf.test
  View file @2d5b854
@@ -635,14 +635,20 @@ $td-&gt;runtest(&quot;dump bad xref&quot;, @@ -635,14 +635,20 @@ $td-&gt;runtest(&quot;dump bad xref&quot;,
635 {$td->FILE => "bad-xref-entry.out", 635 {$td->FILE => "bad-xref-entry.out",
636 $td->EXIT_STATUS => 0}, 636 $td->EXIT_STATUS => 0},
637 $td->NORMALIZE_NEWLINES); 637 $td->NORMALIZE_NEWLINES);
  638 +# Test @file here too.
  639 +open(F, ">args") or die;
  640 +print F "--check\n";
  641 +print F "--show-xref\n";
  642 +close(F);
638 $td->runtest("dump corrected bad xref", 643 $td->runtest("dump corrected bad xref",
639 - {$td->COMMAND => "qpdf --check --show-xref bad-xref-entry.pdf"}, 644 + {$td->COMMAND => "qpdf \@args bad-xref-entry.pdf"},
640 {$td->FILE => "bad-xref-entry-corrected.out", 645 {$td->FILE => "bad-xref-entry-corrected.out",
641 $td->EXIT_STATUS => 3}, 646 $td->EXIT_STATUS => 3},
642 $td->NORMALIZE_NEWLINES); 647 $td->NORMALIZE_NEWLINES);
  648 +unlink "args";
643 649
644 $td->runtest("don't overwrite self", 650 $td->runtest("don't overwrite self",
645 - {$td->COMMAND => "qpdf a.pdf a.pdf"}, 651 + {$td->COMMAND => "(echo a.pdf; echo a.pdf) | qpdf \@-"},
646 {$td->REGEXP => "input file and output file are the same.*", 652 {$td->REGEXP => "input file and output file are the same.*",
647 $td->EXIT_STATUS => 2}); 653 $td->EXIT_STATUS => 2});
648 654