[poppler] Branch 'poppler-0.26' - utils/pdftohtml.cc

[Pino Toscano]

 utils/pdftohtml.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f5e702060a84362bfdf75260531920d4ba8b7333
Author: Pino Toscano <pino at kde.org>
Date:   Sat May 24 15:59:42 2014 +0200

    pdftohtml: exit with 0 with -v and -h

diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 8ce0430..35e8d84 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -200,7 +200,7 @@ int main(int argc, char *argv[]) {
     if (!printVersion) {
       printUsage("pdftohtml", "<PDF-file> [<html-file> <xml-file>]", argDesc);
     }
-    exit(1);
+    exit(printHelp || printVersion ? 0 : 1);
   }
  
   // init error file