From fd651fb49653e89d96b032e010a7d8e891536bb0 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 12 Nov 2012 00:42:49 +0100 Subject: [PATCH] Parse the args (so that -v says vesion only) Fixes bug #56817 --- utils/pdfunite.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc index a16f4dd..6502259 100644 --- a/utils/pdfunite.cc +++ b/utils/pdfunite.cc @@ -7,6 +7,7 @@ // Copyright (C) 2011 Thomas Freitag // Copyright (C) 2012 Arseny Solokha // Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2012 Albert Astals Cid // //======================================================================== #include @@ -56,7 +57,8 @@ int main (int argc, char *argv[]) int exitCode; exitCode = 99; - if (argc <= 3 || printVersion || printHelp) { + const GBool ok = parseArgs (argDesc, &argc, argv); + if (!ok || argc <= 3 || printVersion || printHelp) { fprintf(stderr, "pdfunite version %s\n", PACKAGE_VERSION); fprintf(stderr, "%s\n", popplerCopyright); fprintf(stderr, "%s\n", xpdfCopyright); -- 1.7.11.1 From fd651fb49653e89d96b032e010a7d8e891536bb0 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 12 Nov 2012 00:42:49 +0100 Subject: [PATCH] Parse the args (so that -v says vesion only) Fixes bug #56817 --- utils/pdfunite.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc index a16f4dd..6502259 100644 --- a/utils/pdfunite.cc +++ b/utils/pdfunite.cc @@ -7,6 +7,7 @@ // Copyright (C) 2011 Thomas Freitag // Copyright (C) 2012 Arseny Solokha // Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2012 Albert Astals Cid // //======================================================================== #include @@ -56,7 +57,8 @@ int main (int argc, char *argv[]) int exitCode; exitCode = 99; - if (argc <= 3 || printVersion || printHelp) { + const GBool ok = parseArgs (argDesc, &argc, argv); + if (!ok || argc <= 3 || printVersion || printHelp) { fprintf(stderr, "pdfunite version %s\n", PACKAGE_VERSION); fprintf(stderr, "%s\n", popplerCopyright); fprintf(stderr, "%s\n", xpdfCopyright); -- 1.7.11.1